major move. now ask_from_list returns false when canceled (it doesn't die 'ask_from_list canceled' anymore)

2 files changed, 9 insertions, 5 deletions

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 6a0b86d86..6e89d353e 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -28,7 +28,7 @@ $keyboard ||= $in->ask_from_listf_(_("Keyboard"),
 				   _("Please, choose your keyboard layout."),
 				   \&keyboard::keyboard2text,
 				   [ keyboard::keyboards() ],
-				   keyboard::read());
+				   keyboard::read()) or $in->exit(0);
 
 keyboard::keyboard2text($keyboard) or die "bad keyboard $keyboard\n";
 
@@ -61,6 +61,10 @@ substInFile {
 
 keyboard::write('', $keyboard, $isNotDelete);
 
-$::isEmbedded ? kill(USR1, $::CCPID) : $in->exit(0);
-$keyboard='';
-goto begin;
+if ($::isEmbedded) {
+    kill(USR1, $::CCPID);
+    $keyboard = '';
+    goto begin;
+} else {
+    $in->exit(0);
+}
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index aff16a1b6..ebb332f89 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -42,7 +42,7 @@ $o->{mouse}{device} =
   $o->ask_from_listf(_("Mouse Port"),
 		     _("Please choose on which serial port your mouse is connected to."),
 		     \&mouse::serial_port2text,
-		     [ mouse::serial_ports ]) if $mouse->{type} eq 'serial';
+		     [ mouse::serial_ports ]) || goto begin if $mouse->{type} eq 'serial';
 
 dumpValue(\$mouse);
 mouse::write_conf($mouse);