X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F10adduser;h=51868d4900defa18ea30a5c72d9baaf667288c5e;hb=c967ebfc4e43fb16a0c2c140c66900712be95ab7;hp=e5067dd8c8e94ff3cb76da8a5de5fb9f45b3f3b1;hpb=e5ed5f84c8dff7855284b6d37f14da6a2e85f1c5;p=live-boot-grml.git

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index e5067dd..51868d4 100755
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -26,46 +26,70 @@ then
 fi
 
 . /scripts/live-functions
+load_confmodule
 
-log_begin_msg "Adding live session user..."
+log_begin_msg "Adding live session user"
 
 # live-initramfs script
 
 user_crypted="8Ab05sVQ4LLps" # as in $(echo "live" | mkpasswd -s)
 
 # U6aMy0wojraho is just a blank password
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set passwd/make-user true
-set passwd/root-password-crypted *
-set passwd/user-password-crypted ${user_crypted}
-set passwd/user-fullname ${USERFULLNAME}
-set passwd/username ${USERNAME}
-set passwd/user-uid 999
-EOF
+db_set passwd/make-user true
+db_set passwd/root-password-crypted '*'
+db_set passwd/user-password-crypted ${user_crypted}
+db_set passwd/user-fullname "$USERFULLNAME"
+db_set passwd/username "$USERNAME"
+db_set passwd/user-uid 999
 
 chroot /root /usr/bin/env -i HOME="/root" \
 	TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
-	/usr/lib/user-setup/user-setup-apply > /dev/null
+	/usr/lib/user-setup/user-setup-apply 2>&1 \
+		| grep -v "Shadow passwords are now on"
 
 # Clear out debconf database again to avoid confusing ubiquity later.
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set passwd/make-user
-set passwd/root-password-crypted
-set passwd/user-password-crypted
-set passwd/user-fullname
-set passwd/username
-set passwd/user-uid
-EOF
+db_set passwd/make-user
+db_set passwd/root-password-crypted
+db_set passwd/user-password-crypted
+db_set passwd/user-fullname
+db_set passwd/username
+db_set passwd/user-uid
+
+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 ':')
+	if [ -n "${first_user}" ];
+	then
+		echo "setting default user to: ${first_user}."
+		USERNAME="${first_user}"
+		really_export USERNAME
+	else
+		echo "no other valid users found, disabling autologin."
+		NOAUTOLOGIN="Yes"
+		NOXAUTOLOGIN="Yes"
+		USERNAME=""
+		really_export NOAUTOLOGIN
+		really_export NOXAUTOLOGIN
+		really_export USERNAME
+		log_end_msg
+		exit 0
+	fi
+fi
 
 if [ -z "${NOSUDO}" ]
 then
-	if [ -f /root/etc/sudoers ]
+	if ! grep -q "${USERNAME}" /root/etc/sudoers
 	then
 		echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
 
 		chroot /root sudo -u "${USERNAME}" sh -c "echo 'SU_TO_ROOT_SU=sudo' >> /home/${USERNAME}/.su-to-rootrc"
-		chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/sudo-mode true
-		chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/display-no-pass-info false
+
+		if [ -x /root/usr/bin/gconftool-2 ]
+		then
+			chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/sudo-mode true
+			chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gksu/display-no-pass-info false
+		fi
 
 chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/config && cat > /home/${USERNAME}/.kde/share/config/kdesurc" << EOF
 [super-user-command]
@@ -90,4 +114,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