summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--lib/keyboard.pm4
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 8ae6f6f..c2f0a3e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- don't run mageia-setup-keyboard on Live systems (mga#23946)
+
Version 1.32 - 24 January 2021
- add info for amdgpu vs radeon conflicts
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 {