use /etc/skel for live user home, plant setxkbmap in bash history

diff --git a/live-dvd.mk b/live-dvd.mk
index db5a527a26ddc6ed7c6f7350ab88fa378f569bf8..7c9891ea98b2c53783476dc040f2dab21ce95837 100644 (file)
--- a/live-dvd.mk
+++ b/live-dvd.mk
@@ -86,13 +86,18 @@ _favorites: _xfce
 
 # Place some helpers in bash history ;-)
 _config: cfg_root/home/live/.bash_history
-cfg_root/home/live/.bash_history: cfg_root _users
-       mkdir "$${CFGROOT}/home/live"
+cfg_root/home/live/.bash_history: cfg_root _users cfg_root/home/live/
        printf '%s\n' \
                'sudo git clone https://git.plutz.net/git/blast /mnt/blast' \
                'for m in /proc /sys /dev /run; do sudo mount -o rbind $$m /mnt/$$m; done' \
-               >$@
-       chroot "$${CFGROOT}" chown live:live -R /home/live
+               'setxkbmap us mac' \
+               >>$@
+       chroot "$${CFGROOT}" chown live:live "/home/live/.bash_history"
+
+cfg_root/home/live/: cfg_root/etc/skel/. cfg_root _users
+       cp -a -- "$<" "$@"
+       chroot "$${CFGROOT}" chmod 750 "/home/live/"
+       chroot "$${CFGROOT}" chown live:live -R "/home/live/"
 
 _config: cfg_root/usr/local/share/applications/org.xfce.mousepad.desktop cfg_root/usr/local/share/applications/xfce4-terminal.desktop
 cfg_root/usr/local/share/applications/%.desktop: cfg_root/usr/share/applications/%.desktop