diff options
| author | Stew Benedict <stewb@mandriva.org> | 2001-10-09 20:01:36 +0000 |
|---|---|---|
| committer | Stew Benedict <stewb@mandriva.org> | 2001-10-09 20:01:36 +0000 |
| commit | 6af3f1154dbd387138d9bc39e663f46f6ce4e686 (patch) | |
| tree | ee51d79c86121d0af8e9d7c6df2e20e950cb9fdc /perl-install/keyboard.pm | |
| parent | a3a015c348486f1f91dbf150a0925887157d6dd1 (diff) | |
| download | drakx-backup-do-not-use-6af3f1154dbd387138d9bc39e663f46f6ce4e686.tar drakx-backup-do-not-use-6af3f1154dbd387138d9bc39e663f46f6ce4e686.tar.gz drakx-backup-do-not-use-6af3f1154dbd387138d9bc39e663f46f6ce4e686.tar.bz2 drakx-backup-do-not-use-6af3f1154dbd387138d9bc39e663f46f6ce4e686.tar.xz drakx-backup-do-not-use-6af3f1154dbd387138d9bc39e663f46f6ce4e686.zip | |
move to Linux keycodes on PPC, add additional Apple modelines
Diffstat (limited to 'perl-install/keyboard.pm')
| -rw-r--r-- | perl-install/keyboard.pm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index e93897e63..915f2cb6a 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -151,11 +151,6 @@ arch() =~ /^sparc/ ? ( "uk" => [ __("UK keyboard"), "sunt5-uk", "gb" ], "us" => [ __("US keyboard"), "sunkeymap", "us" ], ) : ( -arch() eq "ppc" ? ( - "de_nodeadkeys" => [ __("German"), "mac-de-latin1-nodeadkeys", "de(nodeadkeys)" ], - "fr" => [ __("French"), "mac-fr2-ext", "fr" ], - "us" => [ __("US keyboard"), "mac-us-ext", "us" ], -) : ( "al" => [ __("Albanian"), "al", "al" ], "am_old" => [ __("Armenian (old)"), "am_old", "am(old)" ], "am" => [ __("Armenian (typewriter)"), "am-armscii8", "am" ], @@ -240,7 +235,7 @@ arch() eq "ppc" ? ( "us_intl" => [ __("US keyboard (international)"), "us-latin1", "us_intl" ], "vn" => [ __("Vietnamese \"numeric row\" QWERTY"),"vn-tcvn", "vn(toggle)" ], "yu" => [ __("Yugoslavian (latin)"), "yu", "hr" ], -)), +), ); #-###################################################################################### @@ -394,6 +389,13 @@ 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"; + substInFile { + $_ = '' if /^\Qdev.mac_hid.keyboard_sends_linux_keycodes/; + $_ .= $s if eof; + } "$prefix/etc/sysctl.conf"; + } } sub read_raw { |