svn commit: r208529 - stable/8/usr.sbin/sysinstall

[Randi Harper]

Author: randi
Date: Tue May 25 03:08:47 2010
New Revision: 208529
URL: http://svn.freebsd.org/changeset/base/208529

Log:
  MFC r208407:
    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)

Modified:
  stable/8/usr.sbin/sysinstall/network.c
Directory Properties:
  stable/8/usr.sbin/sysinstall/   (props changed)

Modified: stable/8/usr.sbin/sysinstall/network.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/network.c	Tue May 25 02:52:10 2010	(r208528)
+++ stable/8/usr.sbin/sysinstall/network.c	Tue May 25 03:08:47 2010	(r208529)
@@ -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");