From 2fed2fdf2db71e0360248bf297003be0e531a4aa Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 21 Jan 2005 09:42:47 +0000
Subject: minimal XkbModel support

---
 perl-install/standalone/keyboarddrake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index fbb46da7e..01de6bf50 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -20,6 +20,9 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
 } else {
     $in = 'interactive'->vnew('su');
 
+    my ($xkb_models, $model2text) = keyboard::xkb_models();
+    $keyboard->{XkbModel} ||= 'pc105';
+
   choose:
     $in->ask_from(N("Keyboard"),
 		  N("Please, choose your keyboard layout."),
@@ -27,7 +30,11 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
 		      format => sub { translate(keyboard::KEYBOARD2text($_[0])) },
 		      list => [ keyboard::KEYBOARDs() ],
 		      type => 'list',
-		  } ]) or goto end;
+		    },
+		    { val => \$keyboard->{XkbModel},
+		      format => sub { $model2text->{$_[0]} },
+		      list => $xkb_models },
+		]) or goto end;
 
     keyboard::group_toggle_choose($in, $keyboard) or goto choose;
 }
-- 
cgit v1.2.1