summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-01 13:45:52 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:09 +0100
commit98479be56a79f58cafcaf65a3db2c06601ecd693 (patch)
tree379844dd571a059751dc7eba501cc8a4eead3957
parente1f1b6e7af1c7d602ffc0d2879dc9ff19bd19583 (diff)
downloadlive-boot-98479be56a79f58cafcaf65a3db2c06601ecd693.tar.gz
live-boot-98479be56a79f58cafcaf65a3db2c06601ecd693.zip
Merging casper 1.219.
-rw-r--r--docs/ChangeLog.casper13
-rwxr-xr-xscripts/live-bottom/22gnome_panel_data5
2 files changed, 13 insertions, 5 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 1c82a8b..3bdf715 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,16 @@
+casper (1.219) lucid; urgency=low
+
+ [ Mario Limonciello ]
+ * Disable casper-reconfigure from 22gnome_panel_data. It doesn't (appear) to
+ serve a functional purpose as the postinst does nothing different for laptops.
+
+ [ Didier Roche ]
+ * add 35copy_wallpaper_cache to copy the wallpaper cache created at boot time
+ to the main user's directory. First boot will take it into account in
+ ureadahead profiling
+
+ -- Didier Roche <didrocks@ubuntu.com> Wed, 17 Feb 2010 19:14:53 +0100
+
casper (1.218) lucid; urgency=low
* Allow dpkg and apt-get to be installed from within commands that operate
diff --git a/scripts/live-bottom/22gnome_panel_data b/scripts/live-bottom/22gnome_panel_data
index 8f24bf4..09449e2 100755
--- a/scripts/live-bottom/22gnome_panel_data
+++ b/scripts/live-bottom/22gnome_panel_data
@@ -31,11 +31,6 @@ log_begin_msg "Configuring gnome-panel-data"
# live-initramfs script
-if chroot /root laptop-detect > /dev/null 2>&1
-then
- live-reconfigure /root gnome-panel-data
-fi
-
if [ -n "${USERNAME}" ]
then
chroot /root sudo -u "${USERNAME}" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true