0.83

+
+	* pbuilder-user-mode-linux: error out when COW file cannot be created.
+	(UML_DEBUGMODE): add --buildplace option.
+
+	* pbuilder-user-mode-linux.1: update manual page since some
+	information are missing.
+	Add information on --buildplace option.
+

5 files changed, 37 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ee47bdc..70f2e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-22  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-user-mode-linux: error out when COW file cannot be created.
+	(UML_DEBUGMODE): add --buildplace option.
+
+	* pbuilder-user-mode-linux.1: update manual page since some 
+	information are missing.
+	Add information on --buildplace option.
+
 2003-08-20  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder-user-mode-linux: give a more helpful message when /dev/ubd/1  is not mountable.
diff --git a/debian/changelog b/debian/changelog
index 7bee4c7..7d5e22a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pbuilder (0.83) unstable; urgency=low
+
+  * user-mode-linux: Check if BUILDPLACE is writable
+  * user-mode-linux: --buildplace options
+
+ -- Junichi Uekawa <dancer@debian.org>  Fri, 22 Aug 2003 19:00:22 +0900
+
 pbuilder (0.82) unstable; urgency=low
 
   * Change use of chown.
diff --git a/pbuilder-uml.conf.5 b/pbuilder-uml.conf.5
index d417ff3..9d74400 100644
--- a/pbuilder-uml.conf.5
+++ b/pbuilder-uml.conf.5
@@ -47,6 +47,7 @@ This is probably mostly useless.
 The location which build will take place.
 .B pbuilder-user-mode-linux
 will place temporary COW files to there.
+The user running UML needs to be able to access that directory.
 
 .TP 
 .BI "UML_MEM=" "128"
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 5e80149..ee0b2b0 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -37,6 +37,10 @@ done
 function usecow () {
     PBUILDER_COWFILENAME="${BUILDPLACE}/$$.cow"
     PBUILDER_COW="${PBUILDER_COWFILENAME},"
+    if ! touch "${PBUILDER_COWFILENAME}"; then
+	echo "E: Cannot write-access to the COW file, check buildplace"
+	exit 1;
+    fi
     rm -f "${PBUILDER_COWFILENAME}"
 }
 
@@ -208,7 +212,10 @@ while [ -n "$1" ] ; do
 	--buildresult)
 	    # ignore buildresult
 	    UML_BUILDRESULT=$(readlink -f "$2")
-	    shift;shift;;
+	    shift; shift;;
+	--buildplace)
+	    BUILDPLACE=$(readlink -f "$2")
+	    shift; shift;; 
 	--logfile)
 	    exec > "$2";
 	    exec 2>&1
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index 002c6fa..6d4ae8c 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -74,15 +74,19 @@ Specify this to set the IP inside UML.
 
 .TP
 .BI "--uml-netmask [" "netmask" "]"
+The netmask.
+
 .TP
 .BI "--uml-network [" "network" "]"
+The network address.
+
 .TP
 .BI "--uml-broadcast [" "broadcast" "]"
+The broadcast address.
+
 .TP
 .BI "--uml-gateway [" "gateway" "]"
-.TP
-.BI "--uml-image [" "UML image" "]"
-Specify the UML image to use.
+The gateway address.
 
 .TP
 .BI "--mount-tmpfs [" "yes" "]"
@@ -147,6 +151,11 @@ Enable tracing of shell scripts used by pbuilder-user-mode-linux.
 .BI "--bindmounts " "/dir/to/bind-mount"
 Bind-mount the directory inside the chroot inside the user-mode-linux.
 
+.TP
+.BI "--buildplace " "place-to-put-COW-file"
+Specify the directory to place the COW file.
+The user needs to be able to access that directory.
+
 .SH "NOTES"
 For 
 .B build