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);