projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.103.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
22screensaver
diff --git
a/scripts/live-bottom/22screensaver
b/scripts/live-bottom/22screensaver
index
51dfbce
..
e161da6
100755
(executable)
--- a/
scripts/live-bottom/22screensaver
+++ b/
scripts/live-bottom/22screensaver
@@
-20,6
+20,11
@@
esac
# live-initramfs header
# live-initramfs header
+if [ -n "${NOXSCREENSAVER}" ]
+then
+ exit 0
+fi
+
. /scripts/live-functions
log_begin_msg "Configuring screensaver..."
. /scripts/live-functions
log_begin_msg "Configuring screensaver..."
@@
-33,4
+38,8
@@
if [ -n "$gnome_screensaver_version" ]; then
chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
fi
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
+fi
+
log_end_msg
log_end_msg