fixed exit on cancel (should cause trouble in DrakConf only).

1 files changed, 33 insertions, 32 deletions

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 75a8a91cf..e1177c148 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -29,38 +29,39 @@ $keyboard ||= $in->ask_from_listf_(_("Keyboard"),
 				   _("Please, choose your keyboard layout."),
 				   \&keyboard::keyboard2text,
 				   [ keyboard::keyboards() ],
-				   keyboard::read()) or $in->exit(0);
-
-keyboard::keyboard2text($keyboard) or die "bad keyboard $keyboard\n";
-
-my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", _("Do you want the BackSpace to return Delete in console?"), 1);
-
-my $kmap = keyboard::keyboard2kmap($keyboard);
-`loadkeys $kmap`;
-
-my $xkb = keyboard::keyboard2xkb($keyboard);
-`setxkbmap $xkb`;
-
-my $f = "/etc/X11/XF86Config";
-my $g = "/etc/X11/XF86Config-4";
-
-substInFile {
-    if (/^Section\s+"Keyboard"/ .. /^EndSection/) {
-	s|^(\s*XkbLayout\s+).*|$1"$xkb"| 
-	  and $_ .= join '', map { "    $_\n" } @{$xkb_options{$xkb} || []};
-	s,^(\s*(XkbVariant|XkbOptions)\s+).*,,; # remove existing one
-    }
-} $f if -e $f && !$::testing;
-
-substInFile {
-    if (/Identifier\s+"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);
+				   keyboard::read());
+if ($keyboard) {
+    keyboard::keyboard2text($keyboard) or die "bad keyboard $keyboard\n";
+
+    my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", _("Do you want the BackSpace to return Delete in console?"), 1);
+
+    my $kmap = keyboard::keyboard2kmap($keyboard);
+    `loadkeys $kmap`;
+
+    my $xkb = keyboard::keyboard2xkb($keyboard);
+    `setxkbmap $xkb`;
+
+    my $f = "/etc/X11/XF86Config";
+    my $g = "/etc/X11/XF86Config-4";
+
+    substInFile {
+	if (/^Section\s+"Keyboard"/ .. /^EndSection/) {
+	    s|^(\s*XkbLayout\s+).*|$1"$xkb"| 
+	      and $_ .= join '', map { "    $_\n" } @{$xkb_options{$xkb} || []};
+	    s,^(\s*(XkbVariant|XkbOptions)\s+).*,,; # remove existing one
+	}
+    } $f if -e $f && !$::testing;
+
+    substInFile {
+	if (/Identifier\s+"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);
+}
 
 if ($::isEmbedded) {
     kill(USR1, $::CCPID);