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
> > --- initramfs-tools-0.93.4/conf/initramfs.conf.old 2010-01-22
> > 17:52:02.000000000 +0000
> > +++ initramfs-tools-0.93.4/conf/initramfs.conf 2010-01-22
> > 17:54:55.000000000 +0000
> > @@ -52,10 +52,14 @@
> > #
> > # DEVICE: ...
> > #
> > -# Specify the network interface, like eth0
> > +# Hard code a device for autoconfiguration. If the empty
> > +# string, or the word "all" then autoconfiguration will occur
> > +# on all devices, and the first reply will be used. May be
> > +# overridden using the "ip=..." argument as per the Linux kernel
> > +# Documentation/filesystems/nfs/nfsroot.txt
> > #
> >
> > -DEVICE=eth0
> > +DEVICE=all
> >
> > #
> > # NFSROOT: [ auto | HOST:MOUNT ]
> > --- lenny/initramfs-tools/scripts/functions.orig 2009-01-07
> > 14:14:37.000000000 +0000
> > +++ lenny/initramfs-tools/scripts/functions 2010-01-22 16:37:26.000000000
> > +0000
> > @@ -269,10 +269,10 @@
> > ;;
> > ""|on|any)
> > # Bring up device
> > - ipconfig -t 180 ${DEVICE}
> > + ipconfig -t 180 "${DEVICE}"
> > ;;
> > dhcp|bootp|rarp|both)
> > - ipconfig -t 180 -c ${IPOPTS} -d ${DEVICE}
> > + ipconfig -t 180 -c ${IPOPTS} -d "${DEVICE}"
> > ;;
> > *)
> > ipconfig -t 180 -d $IPOPTS
> > @@ -292,11 +292,12 @@
> > esac
> >
> > # source ipconfig output
> > - if [ -n "${DEVICE}" ]; then
> > + if [ -n "${DEVICE}" ] && [ "${DEVICE}" != "all" ]; then
> > # 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
> > }
> > --- initramfs-tools-0.93.4/initramfs.conf.5.orig 2010-01-22
> > 17:45:51.000000000 +0000
> > +++ initramfs-tools-0.93.4/initramfs.conf.5 2010-01-22 18:11:43.000000000
> > +0000
> > @@ -57,7 +57,20 @@
> >
> > .TP
> > \fB DEVICE
> > -Specifies the network interface, like eth0.
> > +Specifies the network interface which should be used during IP
> > configuration.
> > +This can be overridden by arguments supplied on the kernel command line
> > using
> > +the 'ip=...' argument as described in
> > +\fIDocumentation/filesystems/nfs/nfsroot.txt\fP from the Linux kernel
> > +documentation.
> > +
> > +If this is set to the empty string, or the value "all" i.e.
> > +\fIDEVICE\fP=\fI"all"\fP then autoconfiguration will be carried out on all
> > +network interfaces, and only the first reply will be used.
> > +
> > +Note that the network devices will have been renamed as specified in
> > +\fI/etc/udev/rules.d/70-persistent-net.rules\fP prior to autoconfiguration,
> > +and that a copy of this file (as it was at the time that
> > +update-initramfs/mkinitramfs was executed) will be included in the
> > initramfs.
> >
> > .TP
> > \fB ROOT
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
