summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-05 19:01:34 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-05 19:01:34 +0000
commit1cf6f18f30047d4ad751d0fea6e63ce20df84bf8 (patch)
treecad95f701053d5e4cd67fb32a6ddc624e840118e
parent7c0338913e0813b1452d273c88003f0064bda01c (diff)
downloaddrakx-kbd-mouse-x11-1cf6f18f30047d4ad751d0fea6e63ce20df84bf8.tar
drakx-kbd-mouse-x11-1cf6f18f30047d4ad751d0fea6e63ce20df84bf8.tar.gz
drakx-kbd-mouse-x11-1cf6f18f30047d4ad751d0fea6e63ce20df84bf8.tar.bz2
drakx-kbd-mouse-x11-1cf6f18f30047d4ad751d0fea6e63ce20df84bf8.tar.xz
drakx-kbd-mouse-x11-1cf6f18f30047d4ad751d0fea6e63ce20df84bf8.zip
(setup_install) do not run setxkbmap during text install
-rw-r--r--NEWS1
-rw-r--r--lib/keyboard.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c0f2891..a5b04d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- do not run setxkbmap during text install
- handle drivers needing SSE
- handle drivers needing firmware (mga#1471, mga#3421)
diff --git a/lib/keyboard.pm b/lib/keyboard.pm
index 6da515e..2125d83 100644
--- a/lib/keyboard.pm
+++ b/lib/keyboard.pm
@@ -590,7 +590,7 @@ sub setup_install {
} else {
log::l("ERROR: can not load keymap");
}
- setup_install_X11($keyboard);
+ setup_install_X11($keyboard) if $::o->{interactive} ne "curses";
}
sub setup_install_X11 {