projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.148.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
22gnome_panel_data
diff --git
a/scripts/live-bottom/22gnome_panel_data
b/scripts/live-bottom/22gnome_panel_data
index
8e071d3
..
bd0be26
100755
(executable)
--- a/
scripts/live-bottom/22gnome_panel_data
+++ b/
scripts/live-bottom/22gnome_panel_data
@@
-27,7
+27,7
@@
fi
. /scripts/live-functions
. /scripts/live-functions
-log_begin_msg "Configuring gnome-panel-data
...
"
+log_begin_msg "Configuring gnome-panel-data"
# live-initramfs script
# live-initramfs script
@@
-41,9
+41,9
@@
fi
panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
-if [ -n "$
panel_version
" ]
+if [ -n "$
{panel_version}" ] && [ -n "${USERNAME}
" ]
then
then
- chroot /root sudo -u "$
USERNAME
" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
+ chroot /root sudo -u "$
{USERNAME}
" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
fi
log_end_msg
fi
log_end_msg