Merging casper 1.138.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index cb17c2e..c705f1a 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,18 @@
+casper (1.138) intrepid; urgency=low
+
+  [ Tormod Volden ]
+  * use full path for vol_id in swap-on-raid detection (LP: #136804)
+
+  [ Martin Pitt ]
+  * 33enable_apport_crashes: Change the apport default file, not the
+    update-notifier gconf keys, to undo the corresponding change for disabling
+    apport right before the release.
+  * Add 45disable_guest_account: Purge the gdm-guest-session package from the
+    live system, since having guest sessions in a live session does not make
+    much sense. (See gdm-guest-login spec)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 31 Jul 2008 14:19:07 +0200
+
 casper (1.137) intrepid; urgency=low
 
   * Update scripts/casper-bottom/15autologin for KDM from KDE 4.
@@ -45,10 +60,28 @@ casper (1.133) intrepid; urgency=low
     loopfile
   * Reverted changes to casper-helpers as requested by Mithrandir since
     replaying the journal on a hibernated system would lead to file system
-    corruption.
+    corruption (LP: #230703).
 
  -- Evan Dandrea <evand@ubuntu.com>  Wed, 18 Jun 2008 12:34:58 -0400
 
+casper (1.132ubuntu0.2) hardy-proposed; urgency=low
+
+  * Test if livemedia is a directory before trying to mount it as a
+    loopfile
+  * Reverted changes to casper-helpers as requested by Mithrandir since
+    replaying the journal on a hibernated system would lead to file system
+    corruption (LP: #230703).
+
+ -- Agostino Russo <agostino.russo@gmail.com>  Tue, 10 Jun 2008 00:27:12 +0100
+
+casper (1.132ubuntu0.1) hardy-proposed; urgency=low
+
+  * Do not scan only vfat volumes when looking for cow devices (LP: #230703)
+  * Allow casper to use a squashfs filesystem within an arbitrary path (LP:
+    #230716, #207137)
+
+ -- Agostino Russo <agostino.russo@gmail.com>  Thu, 15 May 2008 22:10:50 +0100
+
 casper (1.132) intrepid; urgency=low
 
   [ Colin Watson ]

diff --git a/scripts/live-bottom/33enable_apport_crashes b/scripts/live-bottom/33enable_apport_crashes
index f300652..6c35c72 100755 (executable)
--- a/scripts/live-bottom/33enable_apport_crashes
+++ b/scripts/live-bottom/33enable_apport_crashes
@@ -27,15 +27,13 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Enabling notifications about program crashes..."
+log_begin_msg "Enabling detection of crashes..."
 
 # live-initramfs script
 
-update_notifier_version=$(chroot /root dpkg-query -W --showformat='${Version}' update-notifier 2>/dev/null) || update_notifier_version=""
-
-if [ -n "${update_notifier_version}" ]
+if [ -e /root/etc/default/apport ]
 then
-       chroot /root sudo -u "${USERNAME}" gconftool-2 -t bool -s /apps/update-notifier/show_apport_crashes true
+       sed -i 's/enabled=0/enabled=1/' /root/etc/default/apport
 fi
 
 log_end_msg