summaryrefslogtreecommitdiff
path: root/scripts/live-bottom
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-08-06 20:32:02 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:05 +0100
commit27fa9d61e4484d40e8a11fb75ebf88f01d90a6a0 (patch)
treea3e0c5009bb85144e7128a76c05e40b5fc94bd11 /scripts/live-bottom
parent8144f957e4f61ee26c1e56719a78ca4f97073aeb (diff)
downloadlive-boot-27fa9d61e4484d40e8a11fb75ebf88f01d90a6a0.tar.gz
live-boot-27fa9d61e4484d40e8a11fb75ebf88f01d90a6a0.zip
Optimizing gnome-panel-data bottom script by leaving out the stupid things.
Diffstat (limited to 'scripts/live-bottom')
-rwxr-xr-xscripts/live-bottom/22gnome_panel_data11
1 files changed, 3 insertions, 8 deletions
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