[src/netbsd-1-5]: src/distrib/utils/sysinst Pull up rev. 1.54 to netbsd-1-5 b...

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

details:   https://anonhg.NetBSD.org/src/rev/2eedf66d7c4d
branches:  netbsd-1-5
changeset: 489498:2eedf66d7c4d
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Wed Sep 20 21:43:53 2000 +0000

description:
Pull up rev. 1.54 to netbsd-1-5 branch, OK'd by thorpej:

Log:
> date: 2000/07/24 10:52:28;  author: itojun;  state: Exp;  lines: +7 -2
> do not skip IPv6 configuration menu on dhcp configuration.
>
> do not save address/netmask/default router, if we got them from dhcp.
> (we shouldn't do that).  if we keep any of dhcp config into /etc, we shoul
> update rc.conf to run dhcp again.

diffstat:

 distrib/utils/sysinst/defs.h |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r aa0d5966f9b5 -r 2eedf66d7c4d distrib/utils/sysinst/defs.h
--- a/distrib/utils/sysinst/defs.h      Wed Sep 20 20:21:10 2000 +0000
+++ b/distrib/utils/sysinst/defs.h      Wed Sep 20 21:43:53 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.53.2.3 2000/09/20 20:13:14 hubertf Exp $    */
+/*     $NetBSD: defs.h,v 1.53.2.4 2000/09/20 21:43:53 hubertf Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -219,7 +219,7 @@
 EXTERN char command[STRSIZE];
 
 /* Access to network information */
-EXTERN char net_devices [STRSIZE] INIT("");
+EXTERN char net_devices[STRSIZE] INIT("");
 EXTERN char net_dev[STRSIZE] INIT("");
 EXTERN char net_domain[STRSIZE] INIT("");
 EXTERN char net_host[STRSIZE] INIT("");
@@ -228,6 +228,11 @@
 EXTERN char net_namesvr[STRSIZE] INIT("");
 EXTERN char net_defroute[STRSIZE] INIT("");
 EXTERN char net_media[STRSIZE] INIT("");
+EXTERN int net_dhcpconf INIT(0);
+#define DHCPCONF_IPADDR                0x01
+#define DHCPCONF_NAMESVR       0x02
+#define DHCPCONF_HOST          0x04
+#define DHCPCONF_DOMAIN                0x08
 #ifdef INET6
 EXTERN char net_ip6[STRSIZE] INIT("");
 EXTERN char net_namesvr6[STRSIZE] INIT("");