diff options
| -rwxr-xr-x | liveinit | 14 | ||||
| -rwxr-xr-x | make_slackware_live.sh | 1 |
2 files changed, 9 insertions, 6 deletions
@@ -40,6 +40,8 @@ LIVEMAIN="@LIVEMAIN@" MARKER="@MARKER@" PERSISTENCE="@PERSISTENCE@" +LIVEUID="@LIVEUID@" + LIVEMEDIA="" LIVEPATH="" @@ -893,21 +895,21 @@ EOT echo ${TZ} > /mnt/overlay/etc/timezone # KDE4 and PLASMA5 user timezone re-configuration: - if [ -f /mnt/overlay/home/live/.kde/share/config/ktimezonedrc ]; then + if [ -f /mnt/overlay/home/${LIVEUID}/.kde/share/config/ktimezonedrc ]; then sed -i -e "s%^LocalZone=.*%LocalZone=${TZ}%" \ - /mnt/overlay/home/live/.kde/share/config/ktimezonedrc + /mnt/overlay/home/${LIVEUID}/.kde/share/config/ktimezonedrc fi - if [ -f /mnt/overlay/home/live/.config/ktimezonedrc ]; then + if [ -f /mnt/overlay/home/${LIVEUID}/.config/ktimezonedrc ]; then sed -i -e "s%^LocalZone=.*%LocalZone=${TZ}%" \ - /mnt/overlay/home/live/.config/ktimezonedrc + /mnt/overlay/home/${LIVEUID}/.config/ktimezonedrc fi fi if [ ! -z "$LIVEPW" ]; then # User entered a custom live password on the boot commandline: - echo "${MARKER}: Changing password for user 'live'." + echo "${MARKER}: Changing password for user '${LIVEUID}'." chroot /mnt/overlay /usr/sbin/chpasswd <<EOPW -live:${LIVEPW} +${LIVEUID}:${LIVEPW} EOPW fi diff --git a/make_slackware_live.sh b/make_slackware_live.sh index abbe5b7..dc615f1 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1703,6 +1703,7 @@ cat $LIVE_TOOLDIR/liveinit | sed \ -e "s/@MEDIALABEL@/$MEDIALABEL/g" \ -e "s/@PERSISTENCE@/$PERSISTENCE/g" \ -e "s/@DARKSTAR@/$LIVE_HOSTNAME/g" \ + -e "s/@LIVEUID@/$LIVEUID/g" \ > ${LIVE_ROOTDIR}/boot/initrd-tree/init cat /dev/null > ${LIVE_ROOTDIR}/boot/initrd-tree/luksdev # We do not add openobex to the initrd and don't want to see irrelevant errors: |