Merging casper 1.161.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 6517de6..b57c39b 100644 (file)
--- 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@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/22sslcert b/scripts/live-bottom/22sslcert
new file mode 100755 (executable)
index 0000000..1950eef
--- /dev/null
+++ b/scripts/live-bottom/22sslcert
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+       echo "${PREREQ}"
+}
+
+case "${1}" in
+       prereqs)
+               prereqs
+               exit 0
+               ;;
+esac
+
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Regenerating SSL certificate..."
+
+# live-initramfs script
+
+if [ -x /root/usr/sbin/make-ssl-cert ]
+then
+       chroot /root /usr/sbin/make-ssl-cert generate-default-snakeoil --force-overwrite
+fi
+
+log_end_msg