X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F22screensaver;h=584d234c457220473473d3b60b56f1cabda2e249;hb=046580edb4877fc1a4a823e882a0949fbc729544;hp=51dfbce65c038108dac2c97a0641cd26acd1ade0;hpb=25bcd436af6202932ad494c8ddd0a49999579924;p=live-boot-grml.git

diff --git a/scripts/live-bottom/22screensaver b/scripts/live-bottom/22screensaver
index 51dfbce..584d234 100755
--- a/scripts/live-bottom/22screensaver
+++ b/scripts/live-bottom/22screensaver
@@ -20,17 +20,24 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOXSCREENSAVER}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
-log_begin_msg "Configuring screensaver..."
+log_begin_msg "Configuring screensaver"
 
 # live-initramfs script
 
 gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
-if [ -n "$gnome_screensaver_version" ]; then
-    # Support legacy gconf value
-    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
-    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
+
+if [ -n "${gnome_screensaver_version}" ]
+then
+	# Support legacy gconf value
+	chroot /root sudo -u "${USERNAME}" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
+	chroot /root sudo -u "${USERNAME}" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
 fi
 
 log_end_msg