X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F32disable_hibernation;h=f4960e645a2f82ecef734d556b21e48c3d207dad;hb=30d8972aa25fd49dd01aa042155a48bd49c0ae2d;hp=0965c731bf8a8913adf72bbf4cb27dff46da82b8;hpb=cb896241d0ec8eb2bba0cecd11de3500869176a6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/32disable_hibernation b/scripts/live-bottom/32disable_hibernation
index 0965c73..f4960e6 100755
--- a/scripts/live-bottom/32disable_hibernation
+++ b/scripts/live-bottom/32disable_hibernation
@@ -27,23 +27,19 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring power management..."
+log_begin_msg "Configuring power management"
 
 # live-initramfs script
 
 gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-power-manager 2>/dev/null) || panel_version=""
 
-if [ -n "$gpm_version" ]
+if [ -n "${gpm_version}" ] && [ -n "${USERNAME}" ]
 then
 	#live-reconfigure /root gnome-power-manager
-	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/can_hibernate false
+	# 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