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=6719f5f021a2cf88ecd9fd7a9080dd91c1f1d19a;hpb=6c1a2cfab139bb4a61e7bcf5f4cafe3b7498f64e;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/22screensaver b/scripts/casper-bottom/22screensaver
index 6719f5f..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 sudo -u "$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