From d5c526273db473a7d87a26000585900fc10dda7d Mon Sep 17 00:00:00 2001
From: Mystery Man <unknown@mandriva.org>
Date: Wed, 8 Nov 2000 00:01:16 +0000
Subject: This commit was manufactured by cvs2svn to create branch
 'unlabeled-1.1.1'.

---
 perl-install/standalone/keyboarddrake | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'perl-install/standalone/keyboarddrake')

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 016202c68..9bb77e6bb 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -7,16 +7,15 @@ use interactive;
 use keyboard;
 use Xconfigurator_consts;
 use common qw(:system);
-use c;
 
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: keyboarddrake [--expert]\n";
 
-$::expert = /-expert/;
+$::expert = /--expert/;
 $::isStandalone = 1;
 
-my $in = vnew interactive('su');
+my $in = vnew interactive;
 
 my $keyboard = keyboard::text2keyboard(
       $in->ask_from_list_(_("Keyboard"),
@@ -33,8 +32,6 @@ my $xkb = keyboard::keyboard2xkb($keyboard);
 `setxkbmap $xkb`;
 
 my $f = "/etc/X11/XF86Config";
-my $g = "/etc/X11/XF86Config-4";
-
 substInFile {
     if (/^Section "Keyboard"/ .. /^EndSection/) {
 	s|^(\s*XkbLayout\s+).*|$1"$xkb"| 
@@ -43,14 +40,6 @@ substInFile {
     }
 } $f if -e $f && !$::testing;
 
-substInFile {
-    if (/^Identifier "Keyboard1"/ .. /^EndSection/) {
-	s|^(\s*Option\s+"XkbLayout"\s+).*|$1"$xkb"| 
-	  and $_ .= join '', map { /(\S+)(.*)/; qq(    Option "$1" $2\n) } @{$xkb_options{$xkb} || []};
-	s,^(\s*Option\s+"(XkbVariant|XkbOptions)"\s+).*,,; # remove existing one
-    }
-} $g if -e $g && !$::testing;
-
 keyboard::write('', $keyboard, $isNotDelete);
 
-$in->exit(0);
+exec 'true' if ref($in) =~ /gtk/; #- workaround for perl-GTK
-- 
cgit v1.2.1