[Pkg-uml-commit] r185 - in trunk/src/rootstrap: . debian modules

[Mattia Dongili]

Author: malattia
Date: 2006-08-31 20:44:34 +0000 (Thu, 31 Aug 2006)
New Revision: 185

Modified:
   trunk/src/rootstrap/debian/changelog
   trunk/src/rootstrap/modules/debian
   trunk/src/rootstrap/rootstrap.conf
   trunk/src/rootstrap/rootstrap.sgml
Log:
allow preseeding Debconf values. (Closes: #372906)

Modified: trunk/src/rootstrap/debian/changelog
===================================================================
--- trunk/src/rootstrap/debian/changelog	2006-08-31 20:43:53 UTC (rev 184)
+++ trunk/src/rootstrap/debian/changelog	2006-08-31 20:44:34 UTC (rev 185)
@@ -12,8 +12,9 @@
     sources. (Closes: #372937)
   * allow configuring /etc/apt/preferences and /etc/apt/apt.conf in the target
     FS, thanks to Andreas Beckmann. (Closes: #372901)
+  * allow preseeding Debconf values. (Closes: #372906)
 
- -- Mattia Dongili <malattia at debian.org>  Sat, 24 Jun 2006 18:49:11 +0200
+ -- Mattia Dongili <malattia at debian.org>  Thu, 31 Aug 2006 20:51:43 +0200
 
 rootstrap (0.3.22-1) unstable; urgency=low
 

Modified: trunk/src/rootstrap/modules/debian
===================================================================
--- trunk/src/rootstrap/modules/debian	2006-08-31 20:43:53 UTC (rev 184)
+++ trunk/src/rootstrap/modules/debian	2006-08-31 20:44:34 UTC (rev 185)
@@ -33,7 +33,17 @@
     opts="$opts --unpack-tarball $basedebs"
 fi
 
-echo "debootstrap-ing with the following opt: '$opts' for '$dist' on target '$TARGET' using mirror '$mirror' $script"
+if test -n "$debconf_preseed_file" -a -f "$debconf_preseed_file"; then
+	mkdir -p $TARGET/tmp || true
+	cp $debconf_preseed_file $TARGET/tmp/config.dat
+
+	DEBCONF_DB_OVERRIDE="File{/tmp/config.dat}"
+	export DEBCONF_DB_OVERRIDE
+	echo "Preseeding Debconf from $debconf_preseed_file";
+fi
+
+# DEBOOTSTRAP
+echo "debootstrap $opts $dist $TARGET $mirror $script"
 debootstrap $opts $dist $TARGET $mirror $script
 
 # populate sources.list

Modified: trunk/src/rootstrap/rootstrap.conf
===================================================================
--- trunk/src/rootstrap/rootstrap.conf	2006-08-31 20:43:53 UTC (rev 184)
+++ trunk/src/rootstrap/rootstrap.conf	2006-08-31 20:44:34 UTC (rev 185)
@@ -112,6 +112,9 @@
 # Extra packages to install via apt after initial debootstrap install
 #install=myfavoritepackage someotherpackage
 
+# A debconf DB file where to get preseeded answers
+#debconf_preseed_file=/etc/rootstrap/config.dat
+
 # Sources for target's sources list. If no value is given the default
 # is to use the main section of $mirror
 # NOTE: you can provide multiple lines if each new line is indented

Modified: trunk/src/rootstrap/rootstrap.sgml
===================================================================
--- trunk/src/rootstrap/rootstrap.sgml	2006-08-31 20:43:53 UTC (rev 184)
+++ trunk/src/rootstrap/rootstrap.sgml	2006-08-31 20:44:34 UTC (rev 185)
@@ -543,6 +543,18 @@
         </varlistentry>
 
         <varlistentry>
+          <term>debconf_preseed_file</term>
+          <listitem>
+            <para>
+	      A file containing a debconf DB to be used as default.
+	      Read debconf documentation and see your /var/cache/debconf/config.dat
+	      for examples and caveats.
+            </para>
+
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term>sources</term>
           <listitem>
             <para>
@@ -700,6 +712,9 @@
 	<refentrytitle>apt.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
+	<refentrytitle>debconf</refentrytitle><manvolnum>7</manvolnum>
+      </citerefentry>,
+      <citerefentry>
 	<refentrytitle>linux</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>;
       locally installed User-Mode Linux documentation or