From: Daniel Baumann <daniel@debian.org>
Date: Thu, 6 Aug 2009 18:32:02 +0000 (+0200)
Subject: Optimizing gnome-panel-data bottom script by leaving out the stupid things.
X-Git-Tag: debian/2.0.15-1~290
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=27fa9d61e4484d40e8a11fb75ebf88f01d90a6a0;p=live-boot-grml.git

Optimizing gnome-panel-data bottom script by leaving out the stupid things.
---

diff --git a/scripts/live-bottom/22gnome_panel_data b/scripts/live-bottom/22gnome_panel_data
index 9d2bb2f..8f24bf4 100755
--- a/scripts/live-bottom/22gnome_panel_data
+++ b/scripts/live-bottom/22gnome_panel_data
@@ -31,17 +31,12 @@ log_begin_msg "Configuring gnome-panel-data"
 
 # live-initramfs script
 
-if [ -x /root/usr/sbin/laptop-detect ]
+if chroot /root laptop-detect > /dev/null 2>&1
 then
-	if chroot /root laptop-detect
-	then
-		live-reconfigure /root gnome-panel-data
-	fi
+	live-reconfigure /root gnome-panel-data
 fi
 
-panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
-
-if [ -n "${panel_version}" ] && [ -n "${USERNAME}" ]
+if [ -n "${USERNAME}" ]
 then
 	chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
 fi