Oh crud, did I ever screw the pooch! Rather than sync this with -stable,

I backed-out the changes in -current and didn't touch stable at all (I
thought I had my patch order reversed, not what actually happened).
AIEEE!  I can't even blame the crack for this one since I broke my
crack pipe a few weeks ago.  I think sleep deprivation gets the blame
for this one.

Medal for noticing this one goes to:	Jim Bloom <bloom@acm.org>

1 files changed, 7 insertions, 4 deletions

diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c
index d8835d8..9d70278 100644
--- a/release/sysinstall/network.c
+++ b/release/sysinstall/network.c
@@ -123,6 +123,8 @@ mediaInitNetwork(Device *dev)
 		   "in the Networking configuration menu before proceeding.", dev->name);
 	return FALSE;
     }
+    else if (!strcmp(cp, "DHCP"))
+	goto bail;
     msgNotify("ifconfig %s %s", dev->name, cp);
     i = vsystem("ifconfig %s %s", dev->name, cp);
     if (i) {
@@ -140,6 +142,7 @@ mediaInitNetwork(Device *dev)
 	msgNotify("Adding default route to %s.", rp);
 	vsystem("route -n add default %s", rp);
     }
+bail:
     if (isDebug())
 	msgDebug("Network initialized successfully.\n");
     networkInitialized = TRUE;
@@ -325,11 +328,11 @@ startPPP(Device *devp)
     }
     else {
 	dialog_clear_norefresh();
-	msgConfirm("NOTICE: The PPP command is now started on VTY2 (type ALT-F3 to\n"
+	msgConfirm("NOTICE: The PPP command is now started on VTY3 (type ALT-F3 to\n"
            "interact with it, ALT-F1 to switch back here). If you are using\n"
-           "a PAP or CHAP login simply enter \"dial\" otherwise you'll need\n"
-           "need to use is the \"term\" command which starts a terminal\n"
-           "emulator you can use to talk to your modem and dial the service\n"
+           "a PAP or CHAP login simply enter \"dial\", otherwise you'll need\n"
+           "to use the \"term\" command which starts a terminal emulator\n"
+           "which you can use to talk to your modem and dial the service\n"
            "provider.  Once you're connected, come back to this screen and\n"
            "press return.\n\n"
            "DO NOT PRESS [ENTER] HERE UNTIL THE CONNECTION IS FULLY\n"