diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | pbuilder-createbuildenv | 5 | ||||
| -rw-r--r-- | pbuilder-modules | 12 |
4 files changed, 24 insertions, 8 deletions
@@ -1,3 +1,10 @@ +2002-09-22 Junichi Uekawa <dancer@debian.org> + + * pbuilder-createbuildenv: use pbuilder-modules code for + copying etc/ files. + + * pbuilder-modules: split out the function to copy local configuration. + 2002-09-19 Junichi Uekawa <dancer@debian.org> * debian/rules (binary-indep): install pbuilder-user-mode-linux.1 manpage. diff --git a/debian/changelog b/debian/changelog index 012ebcb..071d81a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pbuilder (0.39) unstable; urgency=low + + * NOT YET RELEASED + * Fix dereferencing of symlink code in pbuilder create + thanks: Eric Van Buggenhaut <Eric.VanBuggenhaut@AdValvas.be + + -- Junichi Uekawa <dancer@debian.org> Sun, 22 Sep 2002 15:45:36 +0900 + pbuilder (0.38) unstable; urgency=low * user-mode-linux support. (closes: #116117) diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index b52d24f..f8bdf7e 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -56,12 +56,9 @@ echo " -> debootstrap finished" loadhooks mkdir -p "$BUILDPLACE/tmp/buildd" -echo " -> copying local configuration" -for a in hosts hostname resolv.conf ; do - cp -r /etc/$a "$BUILDPLACE/etc/"; -done +copy_local_configuration installaptlines diff --git a/pbuilder-modules b/pbuilder-modules index a700287..11a8b6b 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -165,6 +165,13 @@ EOF fi } +function copy_local_configuration () { + echo " -> copying local configuration" + for a in hosts hostname resolv.conf; do + cp $( readlink -f /etc/$a ) "$BUILDPLACE/etc/$a"; + done +} + function extractbuildplace () { # after calling this function, umountproc, and cleanbuildplace # needs to be called. Please trap it. @@ -187,10 +194,7 @@ function extractbuildplace () { echo " -> creating local configuration" hostname -f > "$BUILDPLACE/etc/mailname" fi - echo " -> copying local configuration" - for a in hosts hostname resolv.conf; do - cp $( readlink -f /etc/$a ) "$BUILDPLACE/etc/$a"; - done + copy_local_configuration mountproc mkdir -p "$BUILDPLACE/tmp/buildd" |