Adding upstream version 1.154.1.

[live-boot-grml.git] / scripts / live-bottom / 32disable_hibernation

diff --git a/scripts/live-bottom/32disable_hibernation b/scripts/live-bottom/32disable_hibernation
index b75dbd9..f4960e6 100755 (executable)
--- a/scripts/live-bottom/32disable_hibernation
+++ b/scripts/live-bottom/32disable_hibernation
@@ -20,22 +20,26 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOPOWERMANAGEMENT}" ]
+then
+       exit 0
+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" ]; 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
+if [ -n "${gpm_version}" ] && [ -n "${USERNAME}" ]
+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
+       # 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