+ * pbuilder-user-mode-linux: add trapping and cleaning up routine.

+
+	* pbuilder-modules: modify things shuffling around until it works...
+
+	* pbuilder-user-mode-linux (BUILDING_DSC_FILE): add call to pbuilder update.
+
+	* pbuilder-updatebuildenv: check for INTERNAL_BUILD_UML and ignore the
+	basetgz creation in UML.
+
+	* pbuilder-modules: remove invocation of hostname from uml.
+
+	* debian/control (Depends): require 1.31.1 or greater of debianutils for readlink
+
+	* Makefile (install): add pbuilder-user-mode-linux to install target
+
+	* debian/control (Depends): add depends on debianutils, for readlink
+

1 files changed, 6 insertions, 5 deletions

diff --git a/pbuilder-modules b/pbuilder-modules
index 4878e63..a700287 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -184,13 +184,14 @@ function extractbuildplace () {
 	    echo "E: failed to extract $BASETGZ to $BUILDPLACE"
 	    exit 1
 	fi
-	echo " -> copying/creating local configuration"
-	for a in hosts hostname resolv.conf; do 
-	    cp $( readlink -f /etc/$a ) "$BUILDPLACE/etc/$a";
-	done
+	echo " -> creating local configuration"
+	hostname -f > "$BUILDPLACE/etc/mailname"
     fi
+    echo " -> copying local configuration"
+    for a in hosts hostname resolv.conf; do 
+	cp $( readlink -f /etc/$a ) "$BUILDPLACE/etc/$a";
+    done
     mountproc
-    hostname -f > "$BUILDPLACE/etc/mailname"
     mkdir -p "$BUILDPLACE/tmp/buildd"
     
     if [ -n "$DISTRIBUTION" ]; then