X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F10adduser;h=c7adad28d11c23b7680d308b33df1edd1b2a3549;hb=24b9fd1c70013f5847d3a4658e56bd44534e7890;hp=4c0fe8013958984ce0be03bc28a41a46ea9cf1d6;hpb=2910ae281a07441f55215ca74ec38f1d499420f2;p=live-boot-grml.git diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser index 4c0fe80..c7adad2 100755 --- a/scripts/live-bottom/10adduser +++ b/scripts/live-bottom/10adduser @@ -58,7 +58,7 @@ set passwd/username set passwd/user-uid EOF -if ! grep "${USERNAME}" /root/etc/passwd +if ! grep -qs "${USERNAME}" /root/etc/passwd then echo "The default user (${USERNAME}) is not present," first_user=$(grep '^[^:]*:[^:]*:[12]\?[0-9][0-9][0-9][0-9]:' /root/etc/passwd | head -1 | cut -f1 -d ':') @@ -117,4 +117,14 @@ then mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/ fi +if [ -f /root/home/$USERNAME/examples.desktop ]; then + chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/ + mv /root/home/$USERNAME/examples.desktop /root/home/$USERNAME/Desktop/ +fi + +if [ -e /root/usr/share/applications/live-installer-launcher.desktop ] +then + chroot /root install -D -o ${USERNAME} -g ${USERNAME} /usr/share/applications/live-installer-launcher.desktop /home/${USERNAME}/Desktop/live-installer-launcher.desktop +fi + log_end_msg