[Debian-live-changes] r1460 - in dists/trunk/live-initramfs: docs scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-11 13:46:51 +0000 (Fri, 11 May 2007)
New Revision: 1460

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/scripts/live-bottom/10adduser
   dists/trunk/live-initramfs/scripts/live-bottom/22screensaver
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-05-11 13:23:33 UTC (rev 1459)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-05-11 13:46:51 UTC (rev 1460)
@@ -2,6 +2,8 @@
 
 	* hooks/live:
 	  - Reformated.
+	* scripts/live-bottom/10adduser:
+	  - Moved screensaver hack to 22screensaver.
 
 2007-05-09  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-11 13:23:33 UTC (rev 1459)
+++ dists/trunk/live-initramfs/scripts/live-bottom/10adduser	2007-05-11 13:46:51 UTC (rev 1460)
@@ -67,8 +67,6 @@
 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
 
 		for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop

Modified: dists/trunk/live-initramfs/scripts/live-bottom/22screensaver
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/22screensaver	2007-05-11 13:23:33 UTC (rev 1459)
+++ dists/trunk/live-initramfs/scripts/live-bottom/22screensaver	2007-05-11 13:46:51 UTC (rev 1460)
@@ -26,6 +26,12 @@
 
 log_begin_msg "$DESCRIPTION"
 
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+then
+	# XXX - awful hack to stop xscreensaver locking the screen (#7150)
+	echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
+fi
+
 gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
 
 if [ -n "$gnome_screensaver_version" ]