From 846a006bb219850b9f62d32d1a24c7c30f03b1fd Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Fri, 28 Jan 2000 02:15:07 +0000 Subject: [PATCH] OK, I admit defeat - allow the user to override hostname and gateway values set by dhcp. --- release/sysinstall/tcpip.c | 4 ++-- usr.sbin/sysinstall/tcpip.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c index 6a83bb5da5e9..48ce727c89b0 100644 --- a/release/sysinstall/tcpip.c +++ b/release/sysinstall/tcpip.c @@ -363,13 +363,13 @@ netconfig: char *pccard; if (hostname[0]) { - variable_set2(VAR_HOSTNAME, hostname, use_dhcp ? 0 : 1); + variable_set2(VAR_HOSTNAME, hostname, 1); sethostname(hostname, strlen(hostname)); } if (domainname[0]) variable_set2(VAR_DOMAINNAME, domainname, 0); if (gateway[0]) - variable_set2(VAR_GATEWAY, gateway, use_dhcp ? 0 : 1); + variable_set2(VAR_GATEWAY, gateway, 1); if (nameserver[0]) variable_set2(VAR_NAMESERVER, nameserver, 0); if (ipaddr[0]) diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c index 6a83bb5da5e9..48ce727c89b0 100644 --- a/usr.sbin/sysinstall/tcpip.c +++ b/usr.sbin/sysinstall/tcpip.c @@ -363,13 +363,13 @@ netconfig: char *pccard; if (hostname[0]) { - variable_set2(VAR_HOSTNAME, hostname, use_dhcp ? 0 : 1); + variable_set2(VAR_HOSTNAME, hostname, 1); sethostname(hostname, strlen(hostname)); } if (domainname[0]) variable_set2(VAR_DOMAINNAME, domainname, 0); if (gateway[0]) - variable_set2(VAR_GATEWAY, gateway, use_dhcp ? 0 : 1); + variable_set2(VAR_GATEWAY, gateway, 1); if (nameserver[0]) variable_set2(VAR_NAMESERVER, nameserver, 0); if (ipaddr[0])