summaryrefslogtreecommitdiff
path: root/scripts/live-bottom/22gnome_panel_data
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 14:46:42 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:05 +0100
commitfdd8036ba32ad88e83a61191cc4597ae060355d2 (patch)
treefe1bfc2da930128100db011d642be562ed82867e /scripts/live-bottom/22gnome_panel_data
parent140b179f0ff73f3cc1c081f6e6641417a5a0788d (diff)
downloadlive-boot-fdd8036ba32ad88e83a61191cc4597ae060355d2.tar.gz
live-boot-fdd8036ba32ad88e83a61191cc4597ae060355d2.zip
Adding live-initramfs 1.99.2-1.
Diffstat (limited to 'scripts/live-bottom/22gnome_panel_data')
-rwxr-xr-xscripts/live-bottom/22gnome_panel_data20
1 files changed, 14 insertions, 6 deletions
diff --git a/scripts/live-bottom/22gnome_panel_data b/scripts/live-bottom/22gnome_panel_data
index 34f0be1..8e071d3 100755
--- a/scripts/live-bottom/22gnome_panel_data
+++ b/scripts/live-bottom/22gnome_panel_data
@@ -20,22 +20,30 @@ esac
# live-initramfs header
-. /scripts/live-functions
+if [ -n "${NOGNOMEPANEL}" ]
+then
+ exit 0
+fi
+. /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
+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" ]
+then
+ chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
fi
log_end_msg