Module Name: src
Committed By: jmcneill
Date: Sun May 15 17:02:37 UTC 2022
Modified Files:
src/usr.sbin/sysinst: net.c
Log Message:
sysinst: Prompt for hostname and domain, even when using DHCP.
Values discovered from the network may not match desired values for the
target system. Always give an opportunity to override them when using
DHCP.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 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.40 src/usr.sbin/sysinst/net.c:1.41
--- src/usr.sbin/sysinst/net.c:1.40 Thu Jan 13 14:47:11 2022
+++ src/usr.sbin/sysinst/net.c Sun May 15 17:02:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.40 2022/01/13 14:47:11 nia Exp $ */
+/* $NetBSD: net.c,v 1.41 2022/05/15 17:02:37 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -652,13 +652,15 @@ again:
}
}
- if (!(net_dhcpconf & DHCPCONF_HOST))
- msg_prompt_add(MSG_net_host, net_host, net_host,
- sizeof net_host);
-
- if (!(net_dhcpconf & DHCPCONF_DOMAIN))
- msg_prompt_add(MSG_net_domain, net_domain, net_domain,
- sizeof net_domain);
+ /*
+ * Prompt for hostname and domain, even when using DHCP. The names
+ * discovered on the network may not match the desired values
+ * for the target system.
+ */
+ msg_prompt_add(MSG_net_host, net_host, net_host,
+ sizeof net_host);
+ msg_prompt_add(MSG_net_domain, net_domain, net_domain,
+ sizeof net_domain);
if (!dhcp_config) {
/* Manually configure IPv4 */
