summaryrefslogtreecommitdiffstats
path: root/make_slackware_live.sh
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-02-09 00:39:50 +0100
committer Eric Hameleers <alien@slackware.com>2016-02-09 00:39:50 +0100
commit3098f2b255857aa71f6d2453fb28a0a00a2d8ceb (patch)
tree1ac74dc9ecec22d9011e181486c3e61bfcc2a818 /make_slackware_live.sh
parentdf14855f666a94931194bbba33cd19cb0a57b73d (diff)
downloadliveslak-3098f2b255857aa71f6d2453fb28a0a00a2d8ceb.tar.gz
liveslak-3098f2b255857aa71f6d2453fb28a0a00a2d8ceb.tar.xz
Copy files from /etc/skel _after_ they become available.
This block of code was moved up as part of an earlier attempt to group the code in more closely-knit blocks. See commit 4c08b1a2caae4319cd4b97a99a5c387ae86e5fdb . However, it was moved to far up, so we need to revert.
Diffstat (limited to 'make_slackware_live.sh')
-rwxr-xr-xmake_slackware_live.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 7b9ce67..f31485e 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -889,11 +889,6 @@ echo "root:${ROOTPW}" | chpasswd --root ${LIVE_ROOTDIR}
chroot ${LIVE_ROOTDIR} /usr/sbin/useradd -c "Slackware Live User" -g users -G wheel,audio,cdrom,floppy,plugdev,video,power,netdev,lp,scanner,kmem -u 1000 -d /home/live -m -s /bin/bash live
echo "live:${LIVEPW}" | chpasswd --root ${LIVE_ROOTDIR}
-# Give the live user a copy of our skeleton configuration:
-cd ${LIVE_ROOTDIR}/etc/skel/
- find . -exec cp -a --parents "{}" ${LIVE_ROOTDIR}/home/live/ \;
-cd - 1>/dev/null
-
# Configure suauth:
cat <<EOT >${LIVE_ROOTDIR}/etc/suauth
root:live:OWNPASS
@@ -1156,6 +1151,11 @@ fi # End LIVEDE = PLASMA5
# Workaround a bug where our Xkbconfig is not loaded sometimes:
echo "setxkbmap" > ${LIVE_ROOTDIR}/home/live/.xprofile
+# Give the live user a copy of our XFCE (and more) skeleton configuration:
+cd ${LIVE_ROOTDIR}/etc/skel/
+ find . -exec cp -a --parents "{}" ${LIVE_ROOTDIR}/home/live/ \;
+cd - 1>/dev/null
+
# Make sure that user 'live' owns her own files:
chroot ${LIVE_ROOTDIR} chown -R live:users home/live