[26462] in Source-Commits
Re: /svn/athena r25569 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Jun 13 00:40:24 2012
Date: Wed, 13 Jun 2012 00:40:21 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201206051822.q55IM0Mg023677@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1206130039400.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
I guess this is okay since we control the preseed, though it feels a
little bit like only checking part of what we need. ACK.
-Ben
On Tue, 5 Jun 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-06-05 14:22:00 -0400 (Tue, 05 Jun 2012)
> New Revision: 25569
>
> Modified:
> trunk/debathena/scripts/installer/install-debathena.beta.sh
> Log:
> Don't screw with networking/hostname if we passed the right stuff to the installer
>
> Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
> ===================================================================
> --- trunk/debathena/scripts/installer/install-debathena.beta.sh 2012-06-05 17:53:04 UTC (rev 25568)
> +++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2012-06-05 18:22:00 UTC (rev 25569)
> @@ -235,7 +235,7 @@
> # assumed that this config has already happened and shouldn't be stomped on.
>
> # Configure network based on the preseed file settings, if present.
> - if test -f /root/debathena.preseed ; then
> + if test -f /root/debathena.preseed && ! grep -q netcfg/get_ipaddress /proc/cmdline; then
> # Switch to canonical hostname.
> ohostname=`cat /etc/hostname`
> # Hack to avoid installing debconf-get for just this.
>
>
