summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-26 12:16:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-26 12:16:10 +0000
commit516aa0771a29adcfc96c386c27104bf5554e8dc4 (patch)
tree05347942447ae4976e281a47c93fed38486eeb74 /perl-install/standalone
parenta47a4c19bebce17b299e89f459375530987da1ea (diff)
downloaddrakx-516aa0771a29adcfc96c386c27104bf5554e8dc4.tar
drakx-516aa0771a29adcfc96c386c27104bf5554e8dc4.tar.gz
drakx-516aa0771a29adcfc96c386c27104bf5554e8dc4.tar.bz2
drakx-516aa0771a29adcfc96c386c27104bf5554e8dc4.tar.xz
drakx-516aa0771a29adcfc96c386c27104bf5554e8dc4.zip
don't write X config when there is none (otherwise we write a partial X config)
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/keyboarddrake8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index cef005041..10352b2b5 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -38,9 +38,11 @@ if ($::expert) {
keyboard::setxkbmap($keyboard);
eval {
my $xfree_conf = Xconfig::xfree->read;
- my $xkb = keyboard::keyboard2full_xkb($keyboard);
- $xfree_conf->set_keyboard($xkb);
- $xfree_conf->write;
+ if (!is_empty_array_ref($xfree_conf)) {
+ my $xkb = keyboard::keyboard2full_xkb($keyboard);
+ $xfree_conf->set_keyboard($xkb);
+ $xfree_conf->write;
+ }
};
keyboard::write($keyboard);