[26433] in Source-Commits
/svn/athena r25569 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jun 5 14:22:02 2012
Date: Tue, 5 Jun 2012 14:22:00 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206051822.q55IM0Mg023677@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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.
