summaryrefslogtreecommitdiff
path: root/scripts/live-bottom/32disable_hibernation
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-10-04 08:43:54 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:05 +0100
commitaaef53af49f57c7feccb7ed2eb4297e730d0e7a6 (patch)
tree128582e574d2a8e580cc424afd1179ea46b14b1f /scripts/live-bottom/32disable_hibernation
parent7a89bfb777121ee55d870ffe605c6f553d26a7c9 (diff)
downloadlive-boot-aaef53af49f57c7feccb7ed2eb4297e730d0e7a6.tar.gz
live-boot-aaef53af49f57c7feccb7ed2eb4297e730d0e7a6.zip
Merging casper 1.107.
Diffstat (limited to 'scripts/live-bottom/32disable_hibernation')
-rwxr-xr-xscripts/live-bottom/32disable_hibernation5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/live-bottom/32disable_hibernation b/scripts/live-bottom/32disable_hibernation
index 708db5c..f77c668 100755
--- a/scripts/live-bottom/32disable_hibernation
+++ b/scripts/live-bottom/32disable_hibernation
@@ -36,13 +36,14 @@ gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnom
if [ -n "${gpm_version}" ]
then
#live-reconfigure /root gnome-power-manager
+ # Gnome < 2.20
chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false
- chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gnome-power-manager/can_suspend false
+ # Gnome >= 2.20
+ chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gnome-power-manager/general/can_hibernate false
fi
if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]
then
- echo "disableSuspend=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
echo "disableHibernate=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
fi