[Pkg-uml-commit] r207 - trunk/src/rootstrap/modules

[Mattia Dongili]

Author: malattia
Date: 2006-09-18 19:20:50 +0000 (Mon, 18 Sep 2006)
New Revision: 207

Modified:
   trunk/src/rootstrap/modules/debian
Log:
allow using preseed files located anywhere on the host fs - Closes 387679

Modified: trunk/src/rootstrap/modules/debian
===================================================================
--- trunk/src/rootstrap/modules/debian	2006-09-18 19:18:33 UTC (rev 206)
+++ trunk/src/rootstrap/modules/debian	2006-09-18 19:20:50 UTC (rev 207)
@@ -19,6 +19,19 @@
 DEBIAN_FRONTEND=noninteractive
 export DEBIAN_FRONTEND
 
+if test -n "$debconf_preseed_file"; then
+	mkdir -p $TARGET/var/cache/debconf || true
+	for p in $WORKDIR $HOST ; do
+		[ ! -f "$p/$debconf_preseed_file" ] || \
+		( 
+		  cp $p/$debconf_preseed_file $TARGET/var/cache/debconf/config.dat ;
+		  echo "Preseeding Debconf from $debconf_preseed_file";
+		)
+	done
+#	DEBCONF_DB_OVERRIDE="File{/tmp/config.dat}"
+#	export DEBCONF_DB_OVERRIDE
+fi
+
 if test -n "$exclude"; then
     exclude=`echo $exclude | tr ' ' ,`
     opts="--exclude=$exclude"
@@ -33,15 +46,6 @@
     opts="$opts --unpack-tarball $basedebs"
 fi
 
-if test -n "$debconf_preseed_file" -a -f "$debconf_preseed_file"; then
-	mkdir -p $TARGET/var/cache/debconf || true
-	cp $debconf_preseed_file $TARGET/var/cache/debconf/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