From 45335b5b0fbd306a50f6e00fb68fd8ad4fbd6e78 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 30 Jan 2021 13:04:02 +0000
Subject: 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.
---
 NEWS            | 2 ++
 lib/keyboard.pm | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 {
-- 
cgit v1.2.1