summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-10-26 13:23:13 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:06 +0100
commitbd76bd44a773f1495e3d20d5de2a1201ee2fb854 (patch)
tree58cd4aaa83a386c7205f20b7c307b20359fe14d8
parent9ad03c581519a5ce43cb5a4164add2ac30b291d1 (diff)
downloadlive-boot-bd76bd44a773f1495e3d20d5de2a1201ee2fb854.tar.gz
live-boot-bd76bd44a773f1495e3d20d5de2a1201ee2fb854.zip
Merging casper 1.161.
-rw-r--r--docs/ChangeLog.casper8
-rwxr-xr-xscripts/live-bottom/22sslcert34
2 files changed, 42 insertions, 0 deletions
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@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
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