[Debian-live-changes] r1336 - in dists/trunk/live-initramfs: doc scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-06 16:59:54 +0000 (Sun, 06 May 2007)
New Revision: 1336

Modified:
   dists/trunk/live-initramfs/doc/ChangeLog
   dists/trunk/live-initramfs/scripts/live-bottom/10adduser
Log:


Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 16:55:07 UTC (rev 1335)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 16:59:54 UTC (rev 1336)
@@ -27,6 +27,10 @@
 	  - Added patch to add script updating live.conf file.
 	* scripts/live-bottom/05mountpoints:
 	  - Added patch to change /cdrom to more generic /live_media.
+	* scripts/live-bottom/10adduser:
+	  - Added patch to set default password.
+	  - Added patch to make disabling of screensaver conditional to
+	    ubuntu.
 
 2007-05-06  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/scripts/live-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-05-06 16:55:07 UTC (rev 1335)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-05-06 16:59:54 UTC (rev 1336)
@@ -20,10 +20,16 @@
 
 log_begin_msg "$DESCRIPTION"
 
+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-password-crypted ${user_crypted}
 set passwd/user-fullname $USERFULLNAME 
 set passwd/username $USERNAME
 set passwd/user-uid 999
@@ -42,22 +48,20 @@
 
 if [ -f /root/etc/sudoers ]; then
     if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
+        # XXX - awful hack to stop xscreensaver locking the screen (#7150)
+	echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
         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
-    elif [ "${BUILD_SYSTEM}" = "Debian" ]; then
-		echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
+	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
+    else # We are in debian :-)
+    	echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
     fi
 fi
 
-# 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
-
 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/