+

+	* debian/TODO: update
+
+	* pbuilder.8: updated docs.
+
+	* pbuilder-user-mode-linux.1: add docs on new options, mirror and nonusmirror.
+
+	* testsuite/run-test.sh (PBUILDER_UML): add option --mirror.
+
+	* pbuilder-user-mode-linux (UML_DEBUGMODE): support mirror option to set mirror, and nonusmirror.
up

6 files changed, 60 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 44cc293..f982cf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-09-23  Junichi Uekawa  <dancer@debian.org>
+
+	* debian/TODO: update
+
+	* pbuilder.8: updated docs.
+
+	* pbuilder-user-mode-linux.1: add docs on new options, mirror and nonusmirror.
+
+	* testsuite/run-test.sh (PBUILDER_UML): add option --mirror.
+
+	* pbuilder-user-mode-linux (UML_DEBUGMODE): support mirror option to set mirror, and nonusmirror.
+
 2003-09-22  Junichi Uekawa  <dancer@debian.org>
 
 	* pdebuild (ARCHITECTURE): do not || true for dpkg-buildpackage -S.
diff --git a/debian/TODO b/debian/TODO
index 11e420a..e05e975 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -33,6 +33,8 @@ TODO and possible bugs:
 
 * potato su does not like dpkg-source, executes as a bash script.
 
+* Fix UML_EXTRAOPT to use arrays.
+
 $Id$
 
 
diff --git a/debian/changelog b/debian/changelog
index 9dd9db4..da29c34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ pbuilder (0.87) UNRELEASED; urgency=low
 
   * Bug fix: "pdebuild continues after source package fails to build",
     thanks to Matt Kraai (Closes: #211108).
+  * UML: Add --mirror and --nonusmirror options.
 
- -- Junichi Uekawa <dancer@debian.org>  Mon, 22 Sep 2003 07:27:28 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Tue, 23 Sep 2003 08:46:07 +0900
 
 pbuilder (0.86) unstable; urgency=low
 
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 33f6a06..9e33e51 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -206,7 +206,7 @@ while [ -n "$1" ] ; do
 	    . "$2"
 	    shift; shift;;
 	#things that can be passed through with options
-	--timeout|--http-proxy|--hookdir|--aptconfdir|--bindmounts)
+	--timeout|--http-proxy|--hookdir|--aptconfdir|--bindmounts|--mirror|--nonusmirror)
 	    UML_EXTRAOPT="${UML_EXTRAOPT} $1 $2"
 	    shift; shift;;
 	--buildresult)
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index 3e715af..46c0992 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -160,6 +160,45 @@ Bind-mount the directory inside the chroot inside the user-mode-linux.
 Specify the directory to place the COW file.
 The user needs to be able to access that directory.
 
+
+\" copied from pbuilder.8
+
+.TP
+.BI "--mirror [" "mirror location" "]"
+Specifies the url of Debian mirror to be 
+specified in 
+.B "sources.list"
+inside the chroot.
+This option is only valid when distribution is being specified, for 
+update and build targets.
+The format is something like:
+.I "http://http.us.debian.org/debian" 
+which should point to your favorite mirror.
+
+This option can optionally be omitted, and left blank,
+in which case, this part is skipped.
+
+Note that these URLs specified to pbuilder will be used from within
+the chroot, and specifying 
+.B "file:/somewhere/"
+will most probably fail.
+
+.TP
+.BI "--nonusmirror [" "mirror location" "]"
+The non-US mirror, specified like the 
+.B "--mirror"
+option
+
+These options are only valid when
+.B "--override-config"
+option is specified in 
+.B "update"
+target, or when
+.B "pbuilder-user-mode-linux create"
+is being called.
+
+\" copied from pbuilder.8
+
 .SH "NOTES"
 For 
 .B build
diff --git a/pbuilder.8 b/pbuilder.8
index 9703e50..b424fef 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -150,15 +150,15 @@ Like
 .B "deb http://local/mirror stable main|deb file:/usr/local/mirror ./"
 
 The deb lines here are the ones that will appear at the top of the 
-.B sources.list
+.B "sources.list"
 inside the chroot.
 
 These options are only valid when
-.B --override-config
+.B "--override-config"
 option is specified in 
-.B update 
+.B "update"
 target, or when
-.B pbuilder create
+.B "pbuilder create"
 is being called.
 
 .TP