From owner-svn-src-head@FreeBSD.ORG  Sat May 22 00:43:15 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E3E8106564A;
	Sat, 22 May 2010 00:43:15 +0000 (UTC)
	(envelope-from randi@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F1D558FC08;
	Sat, 22 May 2010 00:43:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4M0hEtQ090346;
	Sat, 22 May 2010 00:43:14 GMT (envelope-from randi@svn.freebsd.org)
Received: (from randi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4M0hELT090344;
	Sat, 22 May 2010 00:43:14 GMT (envelope-from randi@svn.freebsd.org)
Message-Id: <201005220043.o4M0hELT090344@svn.freebsd.org>
From: Randi Harper <randi@FreeBSD.org>
Date: Sat, 22 May 2010 00:43:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208407 - head/usr.sbin/sysinstall
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 May 2010 00:43:15 -0000

Author: randi
Date: Sat May 22 00:43:14 2010
New Revision: 208407
URL: http://svn.freebsd.org/changeset/base/208407

Log:
  Flush all routes before adding the default route in order to allow
  sysinstall to cleanly re-initialize the network.
  
  PR: bin/145553
  Submitted by: gcooper
  Approved by: cperciva (mentor)
  MFC after: 3 days

Modified:
  head/usr.sbin/sysinstall/network.c

Modified: head/usr.sbin/sysinstall/network.c
==============================================================================
--- head/usr.sbin/sysinstall/network.c	Fri May 21 23:08:53 2010	(r208406)
+++ head/usr.sbin/sysinstall/network.c	Sat May 22 00:43:14 2010	(r208407)
@@ -141,12 +141,22 @@ mediaInitNetwork(Device *dev)
 	    }
 	    rp = variable_get(VAR_GATEWAY);
 	    if (!rp || *rp == '0') {
-		msgConfirm("No gateway has been set. You may be unable to access hosts\n"
+		msgConfirm("No gateway has been set. You will be unable to access hosts\n"
 			   "not on your local network");
 	    }
 	    else {
+		/* 
+		 * Explicitly flush all routes to get back to a known sane
+		 * state. We don't need to check this exit code because if
+		 * anything fails it will show up in the route add below.
+		 */
+		system("route -n flush");
 		msgDebug("Adding default route to %s.\n", rp);
-		vsystem("route -n add default %s", rp);
+		if (vsystem("route -n add default %s", rp) != 0) {
+		    msgConfirm("Failed to add a default route; please check "
+			       "your network configuration");
+		    return FALSE;
+		}
 	    }
 	} else {
 	    msgDebug("A DHCP interface.  Should already be up.\n");