r2818 - in dists/trunk/live-initramfs: docs scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-09-01 10:11:50 +0000 (Sat, 01 Sep 2007)
New Revision: 2818

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog.casper
   dists/trunk/live-initramfs/scripts/live-bottom/24preseed
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog.casper
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-09-01 10:10:16 UTC (rev 2817)
+++ dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-09-01 10:11:50 UTC (rev 2818)
@@ -1,3 +1,9 @@
+casper (1.98) gutsy; urgency=low
+
+  * Load /preseed.cfg if it exists in the initramfs.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Wed, 29 Aug 2007 16:18:27 +0100
+
 casper (1.97) gutsy; urgency=low
 
   * Fix paths in scripts/casper-bottom/10adduser and

Modified: dists/trunk/live-initramfs/scripts/live-bottom/24preseed
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/24preseed	2007-09-01 10:10:16 UTC (rev 2817)
+++ dists/trunk/live-initramfs/scripts/live-bottom/24preseed	2007-09-01 10:11:50 UTC (rev 2818)
@@ -26,6 +26,10 @@
 
 # live-initramfs script
 
+if [ -e /preseed.cfg ]; then
+       chroot /root debconf-set-selections < /preseed.cfg
+fi
+
 if [ -f "/root/${LOCATION}" ]; then
     chroot /root debconf-set-selections < "/root/${LOCATION}"
 fi