summaryrefslogtreecommitdiffstats
path: root/setup2hd
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-02-27 13:04:45 +0100
committer Eric Hameleers <alien@slackware.com>2016-02-27 13:04:45 +0100
commit04b0160054a15d0d6da9fe752131b2c1e4b5cf02 (patch)
tree98e3d1ddab455ab60932a233f040990a3e1f06ff /setup2hd
parent7e9c679f7e999ba191c5b8f22e4dd31de1879db4 (diff)
downloadliveslak-04b0160054a15d0d6da9fe752131b2c1e4b5cf02.tar.gz
liveslak-04b0160054a15d0d6da9fe752131b2c1e4b5cf02.tar.xz
Do not overwrite a custom keymap.
During setup, a custom keyboard mapping may have been selected.
Diffstat (limited to 'setup2hd')
-rwxr-xr-xsetup2hd6
1 files changed, 5 insertions, 1 deletions
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