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

diff --git a/scripts/live-bottom/32disable_hibernation b/scripts/live-bottom/32disable_hibernation
index 708db5c..ec0e03a 100755
--- a/scripts/live-bottom/32disable_hibernation
+++ b/scripts/live-bottom/32disable_hibernation
@@ -36,14 +36,10 @@ 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
-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
+	# Gnome >= 2.20
+	chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/gnome-power-manager/general/can_hibernate false
 fi
 
 log_end_msg