[26836] in Source-Commits
Re: /svn/athena r25781 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Oct 18 18:28:31 2012
Date: Thu, 18 Oct 2012 18:28:23 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: source-commits@MIT.EDU
In-Reply-To: <201210181929.q9IJTLSs028187@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1210181828090.22950@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
geofft and I ACK'd over zephyr.
-Ben
On Thu, 18 Oct 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-10-18 15:29:21 -0400 (Thu, 18 Oct 2012)
> New Revision: 25781
>
> Modified:
> trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
> Log:
> Pick the first non-loopback interface, not all the non-loopback interfaces
>
> Modified: trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh
> ===================================================================
> --- trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2012-10-03 16:34:50 UTC (rev 25780)
> +++ trunk/debathena/scripts/installer/pxe/stage1/debathena/installer.sh 2012-10-18 19:29:21 UTC (rev 25781)
> @@ -125,7 +125,9 @@
> # also fails, as the DHCP values override it.
> echo "Killing dhcp client."
> killall dhclient
> - ETH0="$(ip -o link show | grep -v loopback | cut -d: -f 2 | tr -d ' ')"
> + echo -n "Determining which interface to use... "
> + ETH0="$(ip -o link show | grep -v loopback | cut -d: -f 2 | tr -d ' ' | head -1)"
> + echo "$ETH0"
> echo "Running: ip addr flush dev $ETH0"
> ip addr flush dev $ETH0
> echo "Running: ip addr add $IPADDR/$maskbits broadcast $bc dev $ETH0"
> @@ -396,6 +398,9 @@
> acpi="reboot=pci"
> fi
>
> +# TODO: Pass the actual interface we're using, not "auto"
> +# Or decide that we only support the first interface, and determine
> +# the name of it using the same method in stage2
> kargs="$knetinfo $kbdcode $acpi locale=en_US interface=auto \
> url=http://18.9.60.73/installer/$distro/debathena.preseed \
> da/pxe=$pxetype da/i=$installertype da/m=$mirrorsite \
>
>
