Adding upstream version 1.95.2.

[live-boot-grml.git] / scripts / live-bottom / 10adduser

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index 394f007..2fabbb3 100755 (executable)
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -1,26 +1,32 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Adding live session user..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+       echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+       prereqs)
+               prereqs
+               exit 0
+               ;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
 
-if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+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"
@@ -28,6 +34,7 @@ fi
 
 # 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
@@ -35,7 +42,7 @@ set passwd/username $USERNAME
 set passwd/user-uid 999
 EOF
 
-if [ "${BUILD_SYSTEM}" == "Debian" ]; then
+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
@@ -45,6 +52,7 @@ fi
 
 # 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
@@ -52,8 +60,11 @@ set passwd/username
 set passwd/user-uid
 EOF
 
+if [ -z "${NOSUDO}" ]
+then
+
 if [ -f /root/etc/sudoers ]; then
-    if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; 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)
@@ -90,6 +101,8 @@ EOF
     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/