+

+	* 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

1 files changed, 39 insertions, 0 deletions

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