[SCM] live-initramfs branch, master, updated. 1.157.4-1-16-g0d83931

[Daniel Baumann]

The following commit has been merged in the master branch:
commit e96c094da102685926ab8dce842c5a6ec62afd08
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Oct 26 13:23:13 2009 +0100

    Merging casper 1.161.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 6517de6..b57c39b 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.161) jaunty; urgency=low
+
+  [ Juanje Ojeda ]
+  * Regenerate SSL certificate at boot so that it isn't the same for all
+    live CD users (LP: #337723).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Tue, 10 Mar 2009 10:39:21 +0000
+
 casper (1.160) jaunty; urgency=low
 
   * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/22sslcert
similarity index 59%
copy from scripts/live-bottom/41apt_cdrom
copy to scripts/live-bottom/22sslcert
index 00606d5..1950eef 100755
--- a/scripts/live-bottom/41apt_cdrom
+++ b/scripts/live-bottom/22sslcert
@@ -20,20 +20,15 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOAPTCDROM}" ]
-then
-	exit 0
-fi
-
 . /scripts/live-functions
 
-log_begin_msg "Adding APT-CDROM source"
+log_begin_msg "Regenerating SSL certificate..."
 
 # live-initramfs script
 
-if [ -d /root/cdrom ]
+if [ -x /root/usr/sbin/make-ssl-cert ]
 then
-	chroot /root apt-cdrom -m add
+	chroot /root /usr/sbin/make-ssl-cert generate-default-snakeoil --force-overwrite
 fi
 
 log_end_msg

-- 
live-initramfs