add possibility to use keyboarddrake non-interactive (aka give the keyboard as

first parameter)

1 files changed, 6 insertions, 2 deletions

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index b12a3f152..33c1862a1 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -11,19 +11,23 @@ use c;
 
 local $_ = join '', @ARGV;
 
-/-h/ and die _("usage: keyboarddrake [--expert]\n");
+/-h/ and die _("usage: keyboarddrake [--expert] [keyboard]\n");
 
 $::expert = /-expert/;
 $::isStandalone = 1;
 
+my ($keyboard) = grep { !/^-/ } @ARGV;
+
 my $in = interactive->vnew('su');
 
-my $keyboard = $in->ask_from_listf_(_("Keyboard"),
+$keyboard ||= $in->ask_from_listf_(_("Keyboard"),
 				   _("Please, choose your keyboard layout."),
 				   \&keyboard::keyboard2text,
 				   [ keyboard::xmodmaps() ],
 				   keyboard::read());
 
+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);