X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F22screensaver;h=967d8c9ea2714a7f19da1c78bc4bc8b0331d53f3;hb=e5ed5f84c8dff7855284b6d37f14da6a2e85f1c5;hp=c800bfb078190661774b3cef99e80742aebe71d3;hpb=9eaf880cb1944045bac06758a0a7a68ea734595c;p=live-boot-grml.git

diff --git a/scripts/live-bottom/22screensaver b/scripts/live-bottom/22screensaver
index c800bfb..967d8c9 100755
--- a/scripts/live-bottom/22screensaver
+++ b/scripts/live-bottom/22screensaver
@@ -20,6 +20,11 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOXSCREENSAVER}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Configuring screensaver..."
@@ -27,14 +32,12 @@ 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
-fi
 
-if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
-    printf "[ScreenSaver]\nLock=false\n" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kdesktoprc
+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