X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F22gnome_panel_data;h=bd0be26d9b3ddc2961f1d206b08dba5fc41e2fd1;hb=94853efc193b3721c9be6d89a756c660b6b57d05;hp=1b4d41b4de28e132421e9b73c0e199bfe1d54156;hpb=9fc9e2a1a11b0edada38cb501fefe4f58aa414ac;p=live-boot-grml.git

diff --git a/scripts/live-bottom/22gnome_panel_data b/scripts/live-bottom/22gnome_panel_data
index 1b4d41b..bd0be26 100755
--- a/scripts/live-bottom/22gnome_panel_data
+++ b/scripts/live-bottom/22gnome_panel_data
@@ -1,34 +1,49 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Configuring gnome-panel-data..."
+#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 "${NOGNOMEPANEL}" ]
+then
+	exit 0
+fi
 
-if [ -x /root/usr/sbin/laptop-detect ]; then
-	if chroot /root laptop-detect; then
-	    live-reconfigure /root gnome-panel-data
+. /scripts/live-functions
+
+log_begin_msg "Configuring gnome-panel-data"
+
+# live-initramfs script
+
+if [ -x /root/usr/sbin/laptop-detect ]
+then
+	if chroot /root laptop-detect
+	then
+		live-reconfigure /root gnome-panel-data
 	fi
 fi
 
 panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
-if [ -n "$panel_version" ]; then
-    chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
+
+if [ -n "${panel_version}" ] && [ -n "${USERNAME}" ]
+then
+	chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
 fi
 
 log_end_msg