diff options
| author | Junichi Uekawa <dancer@dancer64.netfort.gr.jp> | 2007-03-29 00:34:04 +0900 |
|---|---|---|
| committer | Junichi Uekawa <dancer@dancer64.netfort.gr.jp> | 2007-03-29 00:34:04 +0900 |
| commit | ba6eeb57a776640a87dbe64dea155aaaade991cd (patch) | |
| tree | 628652757d037da23e0d937cb77641b5ca50e292 | |
| parent | bdedf208eb3b126694f8ace219a94b56af98dfd3 (diff) | |
| download | pbuilder-ba6eeb57a776640a87dbe64dea155aaaade991cd.tar pbuilder-ba6eeb57a776640a87dbe64dea155aaaade991cd.tar.gz | |
415544: support UML_IP=dhcp
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | pbuilder-uml.conf.5 | 6 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 7 | ||||
| -rw-r--r-- | pbuilder-user-mode-linux.1 | 4 |
5 files changed, 27 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2007-03-29 Junichi Uekawa <dancer@debian.org> + + * pbuilder-uml.conf.5: + * pbuilder-user-mode-linux.1: add documentation for 'dhcp' option. + + * pbuilder-user-mode-linux: allow network dhcp configuration + 415544 + From: Paul TBBle Hampson <Paul.Hampson@Pobox.com> + 2007-03-28 Junichi Uekawa <dancer@debian.org> * pbuilder-user-mode-linux: make more vivid notes on what is diff --git a/debian/changelog b/debian/changelog index 92b38ca..5f2bc63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,11 @@ pbuilder (0.165) UNRELEASED; urgency=low (closes: #409135) * 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> Wed, 28 Mar 2007 08:10:09 +0900 + -- Junichi Uekawa <dancer@debian.org> Thu, 29 Mar 2007 00:05:35 +0900 pbuilder (0.164) unstable; urgency=low diff --git a/pbuilder-uml.conf.5 b/pbuilder-uml.conf.5 index 834bde5..edc14e0 100644 --- a/pbuilder-uml.conf.5 +++ b/pbuilder-uml.conf.5 @@ -21,6 +21,10 @@ to use the slirp connection. .BI "UML_IP=" "192.168.0.3" IP address to use for guest OS. +This can be set to +.B "dhcp" +for obtaining IP address through DHCP. + .TP .BI "UML_NETMASK" "=255.255.255.0" Guest OS netmask @@ -102,5 +106,3 @@ The homepage is available at .RI "pbuilder(" 8 "), " .RI "pbuilderrc(" 5 "), " .RI "pdebuild(" 1 ")" - - diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index 8776cf1..be22ed8 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -101,7 +101,8 @@ else chmod 1777 ${UML_CHROOT_MOUNTPOINT}/tmp fi -cat <<IP > ${UML_CHROOT_MOUNTPOINT}/etc/network/interfaces +if [ -n "${PBUILDER_COW}" -a "${UML_IP}" != 'dhcp']; then + cat <<IP > ${UML_CHROOT_MOUNTPOINT}/etc/network/interfaces auto lo iface lo inet loopback @@ -115,13 +116,17 @@ iface eth0 inet static gateway $UML_GATEWAY IP +fi + cat <<SHELL > ${UML_CHROOT_MOUNTPOINT}/tmp/chrootshell #! /bin/bash ${UML_DEBUGMODE} # the shell executed inside chroot inside UML echo Starting network inside the chroot + mount -t proc /proc /proc /etc/init.d/networking stop /etc/init.d/networking start + umount /proc SHELL chmod a+x ${UML_CHROOT_MOUNTPOINT}/tmp/chrootshell chroot ${UML_CHROOT_MOUNTPOINT} /tmp/chrootshell diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1 index ab25714..0ef50b2 100644 --- a/pbuilder-user-mode-linux.1 +++ b/pbuilder-user-mode-linux.1 @@ -82,6 +82,10 @@ to use the slirp connection. .BI "\-\-uml\-ip [" "IP inside UML" "]" Specify this to set the IP inside UML. +This can be set to +.B "dhcp" +for obtaining IP address through DHCP. + .TP .BI "\-\-uml\-netmask [" "netmask" "]" The netmask. |