+2003-01-09 Junichi Uekawa <dancer@debian.org>

+
+	* pbuilder-user-mode-linux: use /var/cache/pbuilder/pbuilder-mnt
+	instead of /mnt, which may be used for other tasks.
+	PBUILDER_COWFILENAME is buildplace/$$.cow.
+
+	* Makefile (install): install /var/cache/pbuilder/pbuilder-mnt dir.
+
+	* pbuilder-user-mode-linux (UML_EXTRAOPT): --buildresult ignore.
+
+	* pbuilder-user-mode-linux.1: document --uml-hostname
+
+	* pbuilder-user-mode-linux: set hostname inside UML.
+	(UML_EXTRAOPT): --uml-hostname option.
+
+	* pbuilder-uml.conf.5: document
+
+	* pbuilder-uml.conf (UML_HOSTNAME): add variable for hostname

7 files changed, 52 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 327a9f5..5d7e52c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2003-01-09  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-user-mode-linux: use /var/cache/pbuilder/pbuilder-mnt
+	instead of /mnt, which may be used for other tasks.
+	PBUILDER_COWFILENAME is buildplace/$$.cow.
+
+	* Makefile (install): install /var/cache/pbuilder/pbuilder-mnt dir.
+
+	* pbuilder-user-mode-linux (UML_EXTRAOPT): --buildresult ignore.
+
+	* pbuilder-user-mode-linux.1: document --uml-hostname
+
+	* pbuilder-user-mode-linux: set hostname inside UML.
+	(UML_EXTRAOPT): --uml-hostname option.
+
+	* pbuilder-uml.conf.5: document
+
+	* pbuilder-uml.conf (UML_HOSTNAME): add variable for hostname
+
 2003-01-08  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder-user-mode-linux (UML_EXTRAOPT): --logfile option.
diff --git a/Makefile b/Makefile
index b6dd8cb..61ffa2f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ install:
 	$(INSTALL_DIRECTORY) $(DESTDIR)/usr/lib/pbuilder
 	$(INSTALL_DIRECTORY) $(DESTDIR)/usr/share/pbuilder
 	$(INSTALL_DIRECTORY) $(DESTDIR)/usr/share/doc/pbuilder/examples
+	$(INSTALL_DIRECTORY) $(DESTDIR)/var/cache/pbuilder/pbuilder-mnt
 	$(INSTALL_EXECUTABLE) pbuilder-buildpackage $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_EXECUTABLE) pbuilder-buildpackage-funcs $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_EXECUTABLE) pbuilder-createbuildenv $(DESTDIR)/usr/lib/pbuilder/
diff --git a/debian/changelog b/debian/changelog
index 57853b2..1a6ffed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pbuilder (0.61) UNRELEASED; urgency=low
+
+  * UML: set hostname inside UML.
+
+ -- Junichi Uekawa <dancer@debian.org>  Thu,  9 Jan 2003 17:42:24 +0900
+
 pbuilder (0.60) unstable; urgency=low
 
   * customized documentation stylesheets to look like other netfort pages
diff --git a/pbuilder-uml.conf b/pbuilder-uml.conf
index 9dac6d0..4103609 100644
--- a/pbuilder-uml.conf
+++ b/pbuilder-uml.conf
@@ -10,5 +10,7 @@ PBUILDER_UML_IMAGE="${HOME}/uml-image"
 UML_MOUNT_TMPFS="no"
 BUILDPLACE="${HOME}/tmp/"
 UML_MEM=128M
+UML_HOSTNAME=uml-host
+
 
 
diff --git a/pbuilder-uml.conf.5 b/pbuilder-uml.conf.5
index 4225764..4ce95df 100644
--- a/pbuilder-uml.conf.5
+++ b/pbuilder-uml.conf.5
@@ -53,6 +53,10 @@ will place temporary COW files to there.
 The amount of memory allowed for UML.
 Give more value to here.
 
+.TP 
+.BI "UML_HOSTNAME=" "uml-host"
+The hostname for the UML
+
 .SH AUTHOR
 Initial coding, and main maintenance is done by 
 Junichi Uekawa <dancer@debian.org>.
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 8a7a95c..e61cd62 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -35,7 +35,7 @@ for CONFIGFILE in /usr/share/pbuilder/pbuilder-uml.conf /etc/pbuilder/pbuilder-u
 done
 
 function usecow () {
-    PBUILDER_COWFILENAME=$(tempfile -d "${BUILDPLACE}" --suffix .cow)     
+    PBUILDER_COWFILENAME="${BUILDPLACE}/$$.cow"
     PBUILDER_COW="${PBUILDER_COWFILENAME},"
     rm -f "${PBUILDER_COWFILENAME}"
 }
@@ -50,7 +50,7 @@ function operate_uml () {
     # use this script file to bootstrap the pbuilder inside the UML
     INSIDE_PBUILDER=$(tempfile)
     trap cleanup_function exit
-    UML_CHROOT_MOUNTPOINT=/mnt/
+    UML_CHROOT_MOUNTPOINT=/var/cache/pbuilder/pbuilder-mnt
 
 #The following script is ran inside UML as soon as it is started.
 
@@ -61,6 +61,7 @@ mount -t tmpfs /tmp /tmp
 mount -t ext2 /dev/ubd/1 ${UML_CHROOT_MOUNTPOINT}
 export LOGNAME="${LOGNAME}"
 export HOME="${HOME}"
+hostname "${UML_HOSTNAME}"
 if [ "${UML_MOUNT_TMPFS}" = "yes" ]; then
   mount -t tmpfs ${UML_CHROOT_MOUNTPOINT}/tmp ${UML_CHROOT_MOUNTPOINT}/tmp
 else
@@ -102,6 +103,7 @@ if [ -n "${UML_DISTRIBUTION}" ]; then
   EXTRAOPT="--distribution ${UML_DISTRIBUTION}"
 fi
 pbuilder "$1" ${UML_EXTRAOPT} \${EXTRAOPT} --buildresult "" --buildplace ${UML_CHROOT_MOUNTPOINT} --internal-build-uml ${BUILDING_DSC_FILE} 
+echo "Umounting ${UML_CHROOT_MOUNTPOINT}"
 umount ${UML_CHROOT_MOUNTPOINT}
 EOF
 
@@ -154,6 +156,10 @@ while [ -n "$1" ] ; do
 	    UML_MEM="$2";
 	    shift; shift;
 	    ;;
+	--uml-hostname)
+	    UML_HOSTNAME="$2";
+	    shift; shift;
+	    ;;
 	--distribution)
 	    UML_DISTRIBUTION="$2";
 	    shift; shift;
@@ -166,6 +172,9 @@ while [ -n "$1" ] ; do
 	--timeout|--http-proxy|--configfile|--hookdir|--aptconfdir)
 	    UML_EXTRAOPT="${UML_EXTRAOPT} $1 $2"
 	    shift; shift;;
+	--buildresult)
+	    # ignore buildresult
+	    shift;shift;;
 	--logfile)
 	    exec > $(readlink -f "$2");
 	    exec 2>&1
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index b1e8cce..e660694 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -71,6 +71,10 @@ Specify the UML image to use.
 Specify whether to mount tmpfs inside UML chroot.
 
 .TP
+.BI "--uml-hostname [" "uml-host" "]"
+The hostname inside uml.
+
+.TP
 .BI "--distribution [" "sid" "]"
 Specify the distribution.
 see pbuilder.8
@@ -111,6 +115,11 @@ Specify this option to make the output go to
 .I logfilename
 instead of standard output.
 
+.TP 
+.BI "--buildresult " "dummy"
+A dummy option.
+
+
 .SH "NOTES"
 This software is in early stage of development. 
 Reading the source may help you in case this software doesn't work for you.