X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F22gnome_panel_data;h=8e071d37a9be7b083af6106ed8fd8afab2da8bda;hb=dbb49fbb8d4f5869e3105a2831fbbc41beb8b440;hp=34f0be1b5e47132c08199866f48e1083530f1796;hpb=ccea277caf476cdfef4c0f953df5a97062d8be42;p=live-boot-grml.git 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