Module Name: src
Committed By: roy
Date: Fri Sep 12 20:48:55 UTC 2014
Modified Files:
src/usr.sbin/sysinst: net.c
Log Message:
dhcpcd will already have configured the system at this point, so
don't bother writing it manually.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/net.c
diff -u src/usr.sbin/sysinst/net.c:1.6 src/usr.sbin/sysinst/net.c:1.7
--- src/usr.sbin/sysinst/net.c:1.6 Fri Sep 12 20:42:13 2014
+++ src/usr.sbin/sysinst/net.c Fri Sep 12 20:48:55 2014
@@ -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 @@ done:
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 @@ done:
fclose(f);
}
- run_program(0, "/sbin/ifconfig lo0 127.0.0.1");
-
#ifdef INET6
if (v6config && !nfs_root) {
init_v6kernel(1);
