summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-13 10:08:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-13 10:08:16 +0000
commit66a9e8fab73fbb74892bdba745e4dd31f508f5ab (patch)
tree1c61443217b2bb76007dafa643cdd8a67eef9652 /perl-install/standalone
parent222e36ab7e6133a0099896e6b47b6b37947d437a (diff)
downloaddrakx-66a9e8fab73fbb74892bdba745e4dd31f508f5ab.tar
drakx-66a9e8fab73fbb74892bdba745e4dd31f508f5ab.tar.gz
drakx-66a9e8fab73fbb74892bdba745e4dd31f508f5ab.tar.bz2
drakx-66a9e8fab73fbb74892bdba745e4dd31f508f5ab.tar.xz
drakx-66a9e8fab73fbb74892bdba745e4dd31f508f5ab.zip
- keyboard::read() now returns false if the value is not recognised
- new function keyboard::read_or_default() which always returns a valid value
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/keyboarddrake2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 04f65ffad..ef1e700aa 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -13,7 +13,7 @@ use c;
require_root_capability();
my $in;
-my $keyboard = keyboard::read() || keyboard::default();
+my $keyboard = keyboard::read_or_default();
if (my ($kb) = grep { !/^-/ } @ARGV) {
keyboard::KEYBOARD2text($kb) or die "bad keyboard $kb\n";
$keyboard->{KEYBOARD} = $kb;