From fdd8036ba32ad88e83a61191cc4597ae060355d2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 14:46:42 +0200 Subject: Adding live-initramfs 1.99.2-1. --- scripts/live-bottom/22gnome_panel_data | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'scripts/live-bottom/22gnome_panel_data') 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 -- cgit v1.2.3