diff options
| -rw-r--r-- | perl-install/Xconfigurator_consts.pm | 4 | ||||
| -rw-r--r-- | perl-install/keyboard.pm | 2 | ||||
| -rw-r--r-- | perl-install/partition_table_mac.pm | 20 | ||||
| -rw-r--r-- | perl-install/share/list.ppc | 4 |
4 files changed, 29 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm index 29f170a16..17ced34ea 100644 --- a/perl-install/Xconfigurator_consts.pm +++ b/perl-install/Xconfigurator_consts.pm @@ -656,8 +656,12 @@ Section "Modes" Modeline "1024x768" 65 1024 1032 1176 1344 768 771 777 806 -hsync -vsync # iBook2 Modeline "1024x768" 65 1024 1048 1184 1344 768 771 777 806 -hsync -vsync + # 17" Apple Studio Display + Modeline "1024x768" 112.62 1024 1076 1248 1420 768 768 780 808 +hsync +vsync # HiRes Apple Studio Display Modeline "1280x1024" 135 1280 1288 1392 1664 1024 1027 1030 1064 + # Another variation + Modeline "1280x1024" 134.989 1280 1317 1429 1688 1024 1025 1028 1066 +hsync +vsync EndSection '; $modelines_text = ' diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 879e847f4..d921cf5b7 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -391,7 +391,7 @@ sub write { setVarsInSh("$prefix/etc/sysconfig/keyboard", $config); run_program::rooted($prefix, "dumpkeys > /etc/sysconfig/console/default.kmap") or log::l("dumpkeys failed"); if (arch() =~ /ppc/) { - my $s = "dev.mac_hid.keyboard_sends_linux_keycodes = 1"; + my $s = "dev.mac_hid.keyboard_sends_linux_keycodes = 1\n"; substInFile { $_ = '' if /^\Qdev.mac_hid.keyboard_sends_linux_keycodes/; $_ .= $s if eof; diff --git a/perl-install/partition_table_mac.pm b/perl-install/partition_table_mac.pm index d1f65a6db..5c06b8a7e 100644 --- a/perl-install/partition_table_mac.pm +++ b/perl-install/partition_table_mac.pm @@ -19,6 +19,10 @@ my %typeToDos = ( "Apple_Patches" => 0x401, "Apple_HFS" => 0x402, "Apple_UNIX_SVR2" => 0x83, + "Apple_UNIX_SVR2" => 0x183, + "Apple_UNIX_SVR2" => 0x283, + "Apple_UNIX_SVR2" => 0x383, + "Apple_UNIX_SVR2" => 0x483, "Apple_Free" => 0x0, ); my %typeFromDos = reverse %typeToDos; @@ -307,6 +311,22 @@ sub write($$$;$) { $_->{pType} = "Apple_UNIX_SVR2"; $_->{pName} = "Linux Native"; $_->{pFlags} = 0x33; + } elsif ($_->{type} == 0x183) { + $_->{pType} = "Apple_UNIX_SVR2"; + $_->{pName} = "Linux ReiserFS"; + $_->{pFlags} = 0x33; + } elsif ($_->{type} == 0x283) { + $_->{pType} = "Apple_UNIX_SVR2"; + $_->{pName} = "Linux XFS"; + $_->{pFlags} = 0x33; + } elsif ($_->{type} == 0x383) { + $_->{pType} = "Apple_UNIX_SVR2"; + $_->{pName} = "Linux JFS"; + $_->{pFlags} = 0x33; + } elsif ($_->{type} == 0x483) { + $_->{pType} = "Apple_UNIX_SVR2"; + $_->{pName} = "Linux ext3"; + $_->{pFlags} = 0x33; } elsif ($_->{type} == 0x0) { $_->{pType} = "Apple_Free"; $_->{pName} = "Extra"; diff --git a/perl-install/share/list.ppc b/perl-install/share/list.ppc index 86441c399..332c97dc2 100644 --- a/perl-install/share/list.ppc +++ b/perl-install/share/list.ppc @@ -9,3 +9,7 @@ /usr/bin/hcd /sbin/pdisk /usr/X11R6/bin/Xpmac +/usr/X11R6/bin/xmodmap +/sbin/mkfs.xfs +/sbin/mkfs.jfs + |