[src/trunk]: src/usr.sbin/sysinst dhcpcd will already have configured the sys...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab2c28e12e9d
branches:  trunk
changeset: 332241:ab2c28e12e9d
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Sep 12 20:48:55 2014 +0000

description:
dhcpcd will already have configured the system at this point, so
don't bother writing it manually.

diffstat:

 usr.sbin/sysinst/net.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 449bdb850938 -r ab2c28e12e9d usr.sbin/sysinst/net.c
--- a/usr.sbin/sysinst/net.c    Fri Sep 12 20:42:13 2014 +0000
+++ b/usr.sbin/sysinst/net.c    Fri Sep 12 20:48:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.6 2014/09/12 20:42:13 roy Exp $      */
+/*     $NetBSD: net.c,v 1.7 2014/09/12 20:48:55 roy Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -799,6 +799,15 @@
        if (!yesno)
                goto again;
 
+       run_program(0, "/sbin/ifconfig lo0 127.0.0.1");
+
+       /* dhcpcd will have configured it all for us */
+       if (dhcp_config) {
+               fflush(NULL);
+               network_up = 1;
+               return network_up;
+       }
+
        /*
         * we may want to perform checks against inconsistent configuration,
         * like IPv4 DNS server without IPv4 configuration.
@@ -836,8 +845,6 @@
                fclose(f);
        }
 
-       run_program(0, "/sbin/ifconfig lo0 127.0.0.1");
-
 #ifdef INET6
        if (v6config && !nfs_root) {
                init_v6kernel(1);