[SCM] live-initramfs branch, debian-next, updated. debian/1.236.1-1-16-gef9f091

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit ef9f0916aafe021be40385b56277253de57ba1f5
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun May 16 13:34:29 2010 +0200

    Moving 10adduser to live-sysinit.

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
deleted file mode 100755
index 51868d4..0000000
--- a/scripts/live-bottom/10adduser
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-initramfs header
-
-if [ -n "${NOUSER}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-load_confmodule
-
-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
-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 2>&1 \
-		| grep -v "Shadow passwords are now on"
-
-# Clear out debconf database again to avoid confusing ubiquity later.
-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 ! 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"
-
-		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/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
-
-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/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

-- 
live-initramfs