summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2021-01-30 13:04:02 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2021-01-30 13:25:22 +0000
commit45335b5b0fbd306a50f6e00fb68fd8ad4fbd6e78 (patch)
tree85ee1587405a2aa576fc5b3681d0d1613ad2dd17 /lib
parentefb911dc23638206b6201ee28e5b73b407cfaa34 (diff)
downloaddrakx-kbd-mouse-x11-45335b5b0fbd306a50f6e00fb68fd8ad4fbd6e78.tar
drakx-kbd-mouse-x11-45335b5b0fbd306a50f6e00fb68fd8ad4fbd6e78.tar.gz
drakx-kbd-mouse-x11-45335b5b0fbd306a50f6e00fb68fd8ad4fbd6e78.tar.bz2
drakx-kbd-mouse-x11-45335b5b0fbd306a50f6e00fb68fd8ad4fbd6e78.tar.xz
drakx-kbd-mouse-x11-45335b5b0fbd306a50f6e00fb68fd8ad4fbd6e78.zip
Don't run mageia-setup-keyboard on Live systems (mga#23946)
It resets the keyboard type to US, regardless of what is contained in /etc/sysconfig/keyboard.
Diffstat (limited to 'lib')
-rw-r--r--lib/keyboard.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/keyboard.pm b/lib/keyboard.pm
index ca6107c..400a365 100644
--- a/lib/keyboard.pm
+++ b/lib/keyboard.pm
@@ -630,7 +630,9 @@ Section "InputClass"
output_p("$::prefix/etc/X11/xorg.conf.d/00-keyboard.conf", $xorgconf);
run_program::rooted($::prefix, 'dumpkeys', '>', '/etc/sysconfig/console/default.kmap') or log::l("dumpkeys failed");
- run_program::run('mageia-setup-keyboard');
+ # It's uncertain whether this works at all any more. But it certainly
+ # breaks the keyboard settings on Live systems (mga#23946)
+ run_program::run('mageia-setup-keyboard') if ! -e '/run/mgalive';
}
sub configure_and_set_standalone {