X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F10adduser;h=c7adad28d11c23b7680d308b33df1edd1b2a3549;hb=1bad81c0450e84a94dc1d5f4ead9886f15749b80;hp=d76f143663d83c03ddc901e1cfe9fea82e0fd8d5;hpb=cc62ca76356dc851006e3fc980cc1dcc46ef9ca6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index d76f143..c7adad2 100755
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -27,16 +27,11 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Adding live session user..."
+log_begin_msg "Adding live session user"
 
 # live-initramfs script
 
-if [ "${BUILD_SYSTEM}" = "Debian" ]
-then
-	user_crypted="8Ab05sVQ4LLps" # as in $(echo "live" | mkpasswd -s)
-else
-	user_crypted="U6aMy0wojraho" # "ubuntu"
-fi
+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
@@ -45,17 +40,13 @@ 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
+set passwd/user-uid 1000
 EOF
 
-if [ "${BUILD_SYSTEM}" = "Debian" ]
-then
-	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
-else
-	chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
-fi
+chroot /root /usr/bin/env -i HOME="/root" \
+	TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
+	/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
@@ -67,47 +58,55 @@ set passwd/username
 set passwd/user-uid
 EOF
 
+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
-		if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-		then
-			grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
-
-			# XXX - awful hack to stop xscreensaver locking the screen (#7150)
-			echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
-
-			for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop
-			do
-				if [ -f "/root/${file}" ]
-				then
-					chroot /root install -D -o ${USERNAME} -g ${USERNAME} ${file} /home/${USERNAME}/Desktop/$(basename "${file}")
-					break
-				fi
-			done
-		elif [ "${BUILD_SYSTEM}" = "Debian" ]
-		then
-			echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
+		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}" sh -c "echo 'SU_TO_ROOT_SU=sudo' >> /home/${USERNAME}/.su-to-rootrc"
+		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]
 super-user-command=sudo
 EOF
 
-			if [ -f /root/usr/share/apps/konsole/sumc.desktop ]
-			then
-				chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo mc -c/' /usr/share/apps/konsole/sumc.desktop > /home/${USERNAME}/.kde/share/apps/konsole/sumc.desktop"
-			fi
+		if [ -f /root/usr/share/apps/konsole/sumc.desktop ]
+		then
+			chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo mc -c/' /usr/share/apps/konsole/sumc.desktop > /home/${USERNAME}/.kde/share/apps/konsole/sumc.desktop"
+		fi
 
-			if [ -f /root/usr/share/apps/konsole/su.desktop ]
-			then
-				chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo -i/' /usr/share/apps/konsole/su.desktop > /home/${USERNAME}/.kde/share/apps/konsole/su.desktop"
-			fi
+		if [ -f /root/usr/share/apps/konsole/su.desktop ]
+		then
+			chroot /root sudo -u "${USERNAME}" sh -c "umask 0077 && mkdir -p /home/${USERNAME}/.kde/share/apps/konsole && sed -e's/Exec=su.*$/Exec=sudo -i/' /usr/share/apps/konsole/su.desktop > /home/${USERNAME}/.kde/share/apps/konsole/su.desktop"
 		fi
 	fi
 fi
@@ -118,9 +117,14 @@ then
 	mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/
 fi
 
-if [ -f "/root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved" ]
+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/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved /home/${USERNAME}/Desktop/about-kubuntu.desktop
+	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