Bug#566295: initramfs-tools: Deviation from Documentation/filesystems/nfs/nfsroot.txt WRT multiple net devs
On Sat, Apr 10, 2010 at 07:08:47AM +0200, maximilian attems wrote:
> On Fri, 09 Apr 2010, Vagrant Cascadian wrote:
>
> > On Wed, Feb 24, 2010 at 06:22:47PM +0100, maximilian attems wrote:
> > > could you please review belows patch.
> > > if you see no objection, I'd just merge it.
> >
> > i finally got around to testing the proposed patch (after adjusting slightly
> > for newer version). seems to work fine with 0.94.4.
> >
> > i'd probably leave out the support for DEVICE=all (and just rely on DEVICE=""
> > working properly), but that's just personal preference.
> >
> > live well,
> > vagrant
>
> thanks for your review, as I currently lack the capability of testing
> would that look at this patch, please correct me if I missed something,
> or post me your variant, that worked, thanks:
looks good to me. :)
live well,
vagrant
> From 4a0b7bc34031bd669d94ce2e8766e4fb5d85f2c2 Mon Sep 17 00:00:00 2001
> From: maximilian attems <maks@debian.org>
> Date: Sat, 10 Apr 2010 07:04:05 +0200
> Subject: [PATCH] configure_networking(): work with empty DEVICE string
>
> initramfs-tools currently requires a device to be hard-coded, but this
> is not much use if the network device is not known ahead of time. If
> the device specified in either /etc/initramfs-tools/initramfs.conf or
> on the ip=xxx kernel command line.
>
> usefull for multiple net devices.
>
> Closes: #566295, #575766
> Signed-off-by: maximilian attems <maks@debian.org>
> ---
> conf/initramfs.conf | 5 +++--
> scripts/functions | 7 ++++---
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/conf/initramfs.conf b/conf/initramfs.conf
> index 2aa380f..0a108a8 100644
> --- a/conf/initramfs.conf
> +++ b/conf/initramfs.conf
> @@ -58,10 +58,11 @@ BOOT=local
> #
> # DEVICE: ...
> #
> -# Specify the network interface, like eth0
> +# Specify a specific network interface, like eth0
> +# Overriden by optional ip= bootarg
> #
>
> -DEVICE=eth0
> +DEVICE=
>
> #
> # NFSROOT: [ auto | HOST:MOUNT ]
> diff --git a/scripts/functions b/scripts/functions
> index 88f1bbd..1cc9be6 100644
> --- a/scripts/functions
> +++ b/scripts/functions
> @@ -363,10 +363,10 @@ configure_networking()
> ;;
> ""|on|any)
> # Bring up device
> - ipconfig -t ${ROUNDTTT} ${DEVICE}
> + ipconfig -t ${ROUNDTTT} "${DEVICE}"
> ;;
> dhcp|bootp|rarp|both)
> - ipconfig -t ${ROUNDTTT} -c ${IP} -d ${DEVICE}
> + ipconfig -t ${ROUNDTTT} -c ${IP} -d "${DEVICE}"
> ;;
> *)
> ipconfig -t ${ROUNDTTT} -d $IP
> @@ -391,7 +391,8 @@ configure_networking()
> # source specific bootdevice
> . /tmp/net-${DEVICE}.conf
> else
> - # source any interface as not exaclty specified
> + # source any interface...
> + # ipconfig should have quit after first response
> . /tmp/net-*.conf
> fi
> }
> --
> 1.7.0.4
>
Reply to: