From 6af3f1154dbd387138d9bc39e663f46f6ce4e686 Mon Sep 17 00:00:00 2001
From: Stew Benedict <stewb@mandriva.org>
Date: Tue, 9 Oct 2001 20:01:36 +0000
Subject: move to Linux keycodes on PPC, add additional Apple modelines

---
 perl-install/keyboard.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'perl-install/keyboard.pm')

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
@@ -150,11 +150,6 @@ arch() =~ /^sparc/ ? (
  "se" => [ __("Swedish"),        "sunt5-fi-latin1",    "se" ],
  "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)" ],
@@ -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 {
-- 
cgit v1.2.1