From aca4c306be5e8d757fbac86c9de3f6f3862cc471 Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Thu, 8 Feb 2001 10:11:37 +0000
Subject: implemented or updated embedded mode

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

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

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 01f99809d..da23cdc28 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -10,16 +10,20 @@ use Xconfigurator_consts;
 use common qw(:system);
 use c;
 
+$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
 local $_ = join '', @ARGV;
 
 /-h/ and die _("usage: keyboarddrake [--expert] [keyboard]\n");
 
 $::expert = /-expert/;
 
-my ($keyboard) = grep { !/^-/ } @ARGV;
-
+print "[$::expert]\n";
+my $keyboard='';
+if ($::expert) { ($keyboard) = grep { !/^-/ } @ARGV;}
+print "[$keyboard]\n";
 my $in = interactive->vnew('su');
 
+begin:
 $keyboard ||= $in->ask_from_listf_(_("Keyboard"),
 				   _("Please, choose your keyboard layout."),
 				   \&keyboard::keyboard2text,
@@ -57,4 +61,6 @@ substInFile {
 
 keyboard::write('', $keyboard, $isNotDelete);
 
-$in->exit(0);
+$::isEmbedded ? kill(USR1, $::CCPID) : $in->exit(0);
+$keyboard='';
+goto begin;
-- 
cgit v1.2.1