X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F32disable_hibernation;h=f4960e645a2f82ecef734d556b21e48c3d207dad;hb=ad7598cb46a5a6268ca60e5dba156056fb86c09d;hp=813abede228ba56defcafa0bfda4fe86fa38522e;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git

diff --git a/scripts/live-bottom/32disable_hibernation b/scripts/live-bottom/32disable_hibernation
index 813abed..f4960e6 100755
--- a/scripts/live-bottom/32disable_hibernation
+++ b/scripts/live-bottom/32disable_hibernation
@@ -1,36 +1,45 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Configuring power management..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+if [ -n "${NOPOWERMANAGEMENT}" ]
+then
+	exit 0
+fi
+
+. /scripts/live-functions
 
+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