X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F22gnome_panel_data;h=8f24bf4157b9ed06eac6abee31a16015a026ee4d;hb=3f682b4344b8b6fb0e8478ce684783f183c4802d;hp=9d2bb2ff381c0abf89beaf675a5169c955c0a394;hpb=8144f957e4f61ee26c1e56719a78ca4f97073aeb;p=live-boot-grml.git

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