X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F10adduser;h=378f0162230397018e04456a23a6b907474c9fc7;hb=7c815f70054a82bfccf992d9b20d4d56b60f46cc;hp=9179f1b3396529d2199c389b76794e201956dbc6;hpb=d70b77f919f85511936645abb95d710b80c10c74;p=live-boot-grml.git

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index 9179f1b..378f016 100755
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -1,35 +1,53 @@
 #!/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
+
+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
 
 # U6aMy0wojraho is just a blank password
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
 set passwd/root-password-crypted *
-set passwd/user-password-crypted U6aMy0wojraho
-set passwd/user-fullname $USERFULLNAME 
+set passwd/user-password-crypted ${user_crypted}
+set passwd/user-fullname $USERFULLNAME
 set passwd/username $USERNAME
 set passwd/user-uid 999
 EOF
 
-chroot /root /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
+fi
 
 # Clear out debconf database again to avoid confusing ubiquity later.
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
@@ -40,23 +58,48 @@ set passwd/username
 set passwd/user-uid
 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
-    fi
-fi
+	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"
 
-# XXX - awful hack to stop xscreensaver locking the screen (#7150)
-echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
+	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
 
-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
+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
-done
+fi
+
+fi
 
 if [ -L /root/home/$USERNAME/Examples ]; then
     chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/