diff options
| author | dancer <dancer> | 2005-06-12 11:42:10 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2005-06-12 11:42:10 +0000 |
| commit | 6626d6c74afeb37777a28041c4381dc3659e1cf2 (patch) | |
| tree | 23d7da106eb8eae15f657a1f43acfbf5c046dedf | |
| parent | a53f4208cff71c6eb7a1245cc0179b0f2b9f2e4f (diff) | |
| download | pbuilder-6626d6c74afeb37777a28041c4381dc3659e1cf2.tar pbuilder-6626d6c74afeb37777a28041c4381dc3659e1cf2.tar.gz | |
document othermirror option for UML also.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | pbuilder-uml-checkparams | 2 | ||||
| -rw-r--r-- | pbuilder-user-mode-linux.1 | 24 |
3 files changed, 27 insertions, 3 deletions
@@ -1,5 +1,9 @@ 2005-06-12 Junichi Uekawa <dancer@debian.org> + * pbuilder-uml-checkparams: add --othermirror option to uml. + + * pbuilder-user-mode-linux.1: add othermirror documentation. + * pbuilderrc.5: synchronize --othermirror documentation. * pbuilder.8: diff --git a/pbuilder-uml-checkparams b/pbuilder-uml-checkparams index d94f63c..c361247 100644 --- a/pbuilder-uml-checkparams +++ b/pbuilder-uml-checkparams @@ -96,7 +96,7 @@ while [ -n "$1" ] ; do . "$2" shift; shift;; #things that can be passed through with options - --timeout|--http-proxy|--hookdir|--aptconfdir|--bindmounts|--mirror|--nonusmirror) + --timeout|--http-proxy|--hookdir|--aptconfdir|--bindmounts|--mirror|--nonusmirror|--othermirror) UML_EXTRAOPT="${UML_EXTRAOPT} $1 $2" shift; shift;; --buildresult) diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1 index 748f0d7..7497df3 100644 --- a/pbuilder-user-mode-linux.1 +++ b/pbuilder-user-mode-linux.1 @@ -1,4 +1,4 @@ -.TH "pbuilder-user-mode-linux" 1 "2005 Jun 3" "Debian" "pbuilder" +.TH "pbuilder-user-mode-linux" 1 "2005 Jun 12" "Debian" "pbuilder" .SH NAME pbuilder-user-mode-linux \- personal package builder in UML .SH SYNOPSIS @@ -206,13 +206,33 @@ will most probably fail. The non-US mirror, specified like the .B "--mirror" option +.TP +.BI "--othermirror [" "deb http://xxx/xxx/ ./ " "|" " other deb lines... " "]" +The lines which is added to the sources.list, delimited with +.B "|" +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" +inside the chroot. +Be sure to follow the syntax rules of +.RI "sources.list (" 5 ")." +These lines appear at the beginning of the +constructed sources file, so this is the place to list your +.B "local" +mirror sites; apt will then use them in preference to the ones +listed in +.B "--mirror" +and +.B "--nonusmirror". These options are only valid when .B "--override-config" option is specified in .B "update" target, or when -.B "pbuilder-user-mode-linux create" +.B "pbuilder create" is being called. \" copied from pbuilder.8 |