aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunichi Uekawa <dancer@dancer64.netfort.gr.jp>2007-03-31 23:40:35 +0900
committerJunichi Uekawa <dancer@dancer64.netfort.gr.jp>2007-03-31 23:40:35 +0900
commit275a316ca8672eb90a5b38e3ff00d9f9ca9c07c1 (patch)
treeca5a7a35c6f40ead744ce61bf7cbc4d1c95d6100
parent53d1ee22f55f0c8f5347f1ef400bf275afee65a6 (diff)
downloadpbuilder-275a316ca8672eb90a5b38e3ff00d9f9ca9c07c1.tar
pbuilder-275a316ca8672eb90a5b38e3ff00d9f9ca9c07c1.tar.gz
416920: Bug fix: "pbuilder-uml: --uml-ip broken"
-rw-r--r--ChangeLog2
-rw-r--r--debian/changelog4
-rwxr-xr-xpbuilder-user-mode-linux2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a47f480..96b1771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-03-31 Junichi Uekawa <dancer@debian.org>
+ * pbuilder-user-mode-linux: spacing fix.
+
* pbuilder-modules: re-refix. 391915
"The fix for #391915 as applied in 0.165 isn't quite correct,
it still has an unconditional rm -f "$BUILDPLACE/etc/$a" outside
diff --git a/debian/changelog b/debian/changelog
index 0ddaa5d..a8e871d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ pbuilder (0.166) UNRELEASED; urgency=low
[ Junichi Uekawa ]
* Re-Bug fix: "pbuilder: pbuilder-uml should not overwrite network
configuration", thanks to Paul TBBle Hampson (Closes: #391915).
+ * Bug fix: "pbuilder-uml: --uml-ip broken", thanks to Paul TBBle Hampson
+ (Closes: #416920).
- -- Junichi Uekawa <dancer@debian.org> Sat, 31 Mar 2007 23:32:42 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sat, 31 Mar 2007 23:38:20 +0900
pbuilder (0.165) unstable; urgency=low
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 23941d6..53bbea1 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -101,7 +101,7 @@ else
chmod 1777 ${UML_CHROOT_MOUNTPOINT}/tmp
fi
-if [ "${UML_IP}" != 'dhcp']; then
+if [ "${UML_IP}" != 'dhcp' ]; then
cat <<IP > ${UML_CHROOT_MOUNTPOINT}/etc/network/interfaces
auto lo
iface lo inet loopback