diff options
| author | dancer <dancer> | 2003-07-02 15:23:30 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2003-07-02 15:23:30 +0000 |
| commit | 6c7e5767167a530384bb457aa6468c7452de47fe (patch) | |
| tree | 0b5bafacd2dcc38e9759f1df4c36c07366c31b86 | |
| parent | 5ccb488a4975abb620bea81b46bd5770a7347226 (diff) | |
| download | pbuilder-6c7e5767167a530384bb457aa6468c7452de47fe.tar pbuilder-6c7e5767167a530384bb457aa6468c7452de47fe.tar.gz | |
patch user-mode-linux to use --configfile option
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 6 | ||||
| -rw-r--r-- | pbuilder-user-mode-linux.1 | 2 |
4 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2003-07-03 Junichi Uekawa <dancer@debian.org> + + * pbuilder-user-mode-linux.1: document that. + + * pbuilder-user-mode-linux (UML_DEBUGMODE): interpret --configfile itself and then pass to pbuilder. + 2003-06-07 Junichi Uekawa <dancer@debian.org> * pbuilder.8: update documentation so that --othermirror is obvious. diff --git a/debian/changelog b/debian/changelog index 78870c1..f1ad7c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pbuilder (0.76) UNRELEASED; urgency=low + + * Read config file in pbuilder-user-mode-linux specified by + --configfile. + + -- Junichi Uekawa <dancer@debian.org> Thu, 3 Jul 2003 00:23:13 +0900 + pbuilder (0.75) unstable; urgency=low * Update documentation to note that --configfile is useful for diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index 4ccc414..e2d3d9f 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -188,8 +188,12 @@ while [ -n "$1" ] ; do --override-config|--binary-arch) UML_EXTRAOPT="${UML_EXTRAOPT} $1" shift;; + --configfile) + UML_EXTRAOPT="${UML_EXTRAOPT} $1 $2" + . "$2" + shift; shift;; #things that can be passed through with options - --timeout|--http-proxy|--configfile|--hookdir|--aptconfdir|--bindmounts) + --timeout|--http-proxy|--hookdir|--aptconfdir|--bindmounts) UML_EXTRAOPT="${UML_EXTRAOPT} $1 $2" shift; shift;; --buildresult) diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1 index b2af482..2e353ff 100644 --- a/pbuilder-user-mode-linux.1 +++ b/pbuilder-user-mode-linux.1 @@ -103,6 +103,8 @@ see pbuilder.8 .TP .BI "--configfile " "config file to read" Makes pbuilder to read the config file inside UML. +pbuilder-user-mode-linux itself would be affected by the contents of the +config file. .TP .BI "--hookdir " "location of hooks" |