X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F10adduser;h=4c83fa3194a4ef6ea73ef9a6e498c21c81f22ec6;hb=cb896241d0ec8eb2bba0cecd11de3500869176a6;hp=0f28def6b36c5ad587fc5cf23646b556c7710871;hpb=07326dcaadd181e214db9b002180a0e086c4df40;p=live-boot-grml.git

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index 0f28def..4c83fa3 100755
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -20,20 +20,26 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOUSER}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Adding live session user..."
 
 # live-initramfs script
 
-if [ "${BUILD_SYSTEM}" = "Debian" ]; then
-    user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s`
+if [ "${BUILD_SYSTEM}" = "Debian" ]
+then
+	user_crypted="8Ab05sVQ4LLps" # as in `echo "live" | mkpasswd -s`
 else
-    user_crypted="U6aMy0wojraho" # "ubuntu"
+	user_crypted="U6aMy0wojraho" # "ubuntu"
 fi
 
 # U6aMy0wojraho is just a blank password
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+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}
@@ -42,16 +48,17 @@ set passwd/username $USERNAME
 set passwd/user-uid 999
 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
+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
+	chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
 fi
 
 # Clear out debconf database again to avoid confusing ubiquity later.
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set passwd/make-user
 set passwd/root-password-crypted
 set passwd/user-password-crypted
@@ -62,54 +69,58 @@ EOF
 
 if [ -z "${NOSUDO}" ]
 then
-
-if [ -f /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
-
-	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 [ -f /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
+
+			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
 
 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"
+			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
-    fi
 fi
 
+if [ -L /root/home/$USERNAME/Examples ]
+then
+	chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
+	mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/
 fi
 
-if [ -L /root/home/$USERNAME/Examples ]; then
-    chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
-    mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/
-fi
-
-if [ -f "/root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved" ]; 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
+if [ -f "/root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved" ]
+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
 fi
 
 log_end_msg