X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F22screensaver;h=e5965e8eae1e055437518ced48af3edceefa3868;hb=refs%2Ftags%2Fdebian%2F1.79%2Bdebian-1;hp=2a98b1a5a8c7403b4159ed441d45d43cf043db39;hpb=4a0b1ba4d428c623d14bae7f0db85c80abb0da0a;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/22screensaver b/scripts/casper-bottom/22screensaver
index 2a98b1a..e5965e8 100755
--- a/scripts/casper-bottom/22screensaver
+++ b/scripts/casper-bottom/22screensaver
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Configuring screensaver..."
 
-. /scripts/functions
+. /scripts/casper-functions
 
 prereqs()
 {
@@ -20,9 +20,17 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
+
 gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
+
+if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+	gnome_screensaver_lock="/apps/gnome-screensaver/lock"
+else
+	gnome_screensaver_lock="/apps/gnome-screensaver/lock_enabled"
+fi
+	
 if [ -n "$gnome_screensaver_version" ]; then
-    chroot /root su $USERNAME -- gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
+    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s "${gnome_screensaver_lock}" false
 fi
 
 log_end_msg