From 04b0160054a15d0d6da9fe752131b2c1e4b5cf02 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 27 Feb 2016 13:04:45 +0100
Subject: Do not overwrite a custom keymap.

During setup, a custom keyboard mapping may have been selected.
---
 setup2hd | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/setup2hd b/setup2hd
index 3107345..a639e45 100755
--- a/setup2hd
+++ b/setup2hd
@@ -215,9 +215,13 @@ Press ENTER to return to the main menu." 16 68
   # (some of these may not be present but the command will not fail):
   dialog --title "POST-INSTALL SLACKWARE @LIVEDE@ LIVE DATA" --infobox \
    "\nCopying Live modifications to hard disk ..." 5 65
+  # Do not overwrite a custom keymap:
+  if [ ! -f $T_PX/etc/rc.d/rc.keymap ]; then
+    unsquashfs -f -dest $T_PX /mnt/livemedia/@LIVEMAIN@/system/0099*zzzconf*.sxz \
+      /etc/rc.d/rc.keymap
+  fi
   unsquashfs -f -dest $T_PX /mnt/livemedia/@LIVEMAIN@/system/0099*zzzconf*.sxz \
     /etc/profile.d/lang.sh \
-    /etc/rc.d/rc.keymap \
     /etc/slackpkg \
     /etc/X11/xorg.conf.d/30-keyboard.conf \
     /etc/X11/xdm/liveslak-xdm
-- 
cgit v1.2.3