diff options
| author | Junichi Uekawa <dancer@dancer64.netfort.gr.jp> | 2007-03-30 20:31:54 +0900 |
|---|---|---|
| committer | Junichi Uekawa <dancer@dancer64.netfort.gr.jp> | 2007-03-30 20:31:54 +0900 |
| commit | 4dca0e82fab186466afd3e959b737c1b8075c268 (patch) | |
| tree | 9a5f4008d31cacadfcdc48e001cda93d8919ad0c | |
| parent | 2cb7c0dc359fcee9d7c841cf82a2f9a2f41100b0 (diff) | |
| download | pbuilder-4dca0e82fab186466afd3e959b737c1b8075c268.tar pbuilder-4dca0e82fab186466afd3e959b737c1b8075c268.tar.gz | |
do not try to decide network configuration based on PBUILDER_COW
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2007-03-30 Junichi Uekawa <dancer@debian.org> + + * pbuilder-user-mode-linux : '-n "${PBUILDER_COW}"' is not a good + condition since it will change default behavior for pbuilder create/update. + Just use UML_IP=dhcp for condition. + 2007-03-29 Junichi Uekawa <dancer@debian.org> * pbuilder-uml.conf.5: diff --git a/debian/changelog b/debian/changelog index 5f2bc63..abd9a68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,6 @@ pbuilder (0.165) UNRELEASED; urgency=low * Try to warn only if network configuration files are not found on host OS, not error out. (closes: #391915) * support UML_IP=dhcp. (closes: #415544) - - user-mode-linux: do not overwrite /etc/network/interfacess when - PBUILDER_COW is not set (why?) -- Junichi Uekawa <dancer@debian.org> Thu, 29 Mar 2007 00:05:35 +0900 diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index be22ed8..23941d6 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -101,7 +101,7 @@ else chmod 1777 ${UML_CHROOT_MOUNTPOINT}/tmp fi -if [ -n "${PBUILDER_COW}" -a "${UML_IP}" != 'dhcp']; then +if [ "${UML_IP}" != 'dhcp']; then cat <<IP > ${UML_CHROOT_MOUNTPOINT}/etc/network/interfaces auto lo iface lo inet loopback |