diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | pbuilder-modules | 10 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 9 |
4 files changed, 26 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2007-03-28 Junichi Uekawa <dancer@debian.org> + * pbuilder-user-mode-linux: make more vivid notes on what is + executed inside the user-mode-linux + + * pbuilder-modules: for pbuilder-user-mode-linux; only warn if + host network configuration files are not available, and assume it + is correct inside the chroot, and give out a W: warning. + From: Paul TBBle Hampson <Paul.Hampson@Pobox.com> + * debuild-pbuilder.1, pbuilder-uml.conf.5, pbuilder-user-mode-linux.1, pbuilder.8, pbuilderrc.5, pdebuild-user-mode-linux.1, pdebuild.1: 409135: Fix 'SEE ALSO' diff --git a/debian/changelog b/debian/changelog index cf19977..92b38ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ pbuilder (0.165) UNRELEASED; urgency=low (closes: #399484) * Change 'SEE ALSO' spacing from 'pdebuild (1)' => 'pdebuild(1)' to. (closes: #409135) + * Try to warn only if network configuration files are not found on host + OS, not error out. (closes: #391915) - -- Junichi Uekawa <dancer@debian.org> Wed, 28 Mar 2007 08:03:15 +0900 + -- Junichi Uekawa <dancer@debian.org> Wed, 28 Mar 2007 08:10:09 +0900 pbuilder (0.164) unstable; urgency=low diff --git a/pbuilder-modules b/pbuilder-modules index 93880fa..dd135d8 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -329,10 +329,12 @@ function copy_local_configuration () { echo " -> copying local configuration" for a in hosts hostname resolv.conf; do rm -f "$BUILDPLACE/etc/$a" - if [ ! -f "/etc/$a" ]; then - echo "E: /etc/$a does not exist, your setup is insane. fix it" >&2 - fi - cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a"; + if [ -f "/etc/$a" ]; then + rm -f "$BUILDPLACE/etc/$a" + cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a"; + else + echo "W: No local /etc/$a to copy, relying on $BUILDPLACE/etc/$a to be correct" >&2 + fi done } diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index 96f3d0d..debd38b 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -58,6 +58,11 @@ function operate_uml () { cat <<EOF > ${INSIDE_PBUILDER} #! /bin/bash + +### +### BEGIN CODE EXECUTED INSIDE User-mode-linux +### + ${UML_DEBUGMODE} mount -t proc /proc /proc @@ -145,6 +150,10 @@ fi umount /dev umount ${UML_CHROOT_MOUNTPOINT} /sbin/halt -d -f + +### +### END CODE EXECUTED INSIDE User-mode-linux +### EOF chmod a+x ${INSIDE_PBUILDER} |