X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F32disable_hibernation;h=f77c66867d92e02e1861f169ccd28911ddc7aad8;hb=c9df233f3f817379e27d860738abafdee3463526;hp=708db5c5d90cb7468c9a4d125fb8db405cda5c7e;hpb=658c0f1514abe8176d76897c61cad8e0ba8ed610;p=live-boot-grml.git

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