X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F22screensaver;h=584d234c457220473473d3b60b56f1cabda2e249;hb=046580edb4877fc1a4a823e882a0949fbc729544;hp=e161da65bc59772eb4a2706ad06d3143c84c6ae0;hpb=b15f95e06e40a70ed75c30b31cee89d43ec8196b;p=live-boot-grml.git diff --git a/scripts/live-bottom/22screensaver b/scripts/live-bottom/22screensaver index e161da6..584d234 100755 --- a/scripts/live-bottom/22screensaver +++ b/scripts/live-bottom/22screensaver @@ -27,19 +27,17 @@ 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 -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