Browse Source

"host-name" -> "DHCP hostname" in comments

r17184
master
Thomas Hood 18 years ago
parent
commit
005f955db9
  1. 4
      debian/changelog
  2. 12
      dhcp.c

4
debian/changelog

@ -22,9 +22,9 @@ netcfg (0.71) UNRELEASED; urgency=low
+ Mark local variables with "static"
+ Eliminate use of quit_after_hostname by creating HOSTNAME_SANS_NETWORK
from HOSTNAME and DOMAIN_SANS_NETWORK from DOMAIN
+ Use DHCP host-name as the default hostname if no hostname is set
+ Use DHCP hostname as the default hostname if no hostname is set
(Closes: #239591)
+ Write host-name provided to the DHCP client in order to get a lease
+ Write hostname provided to the DHCP client in order to get a lease
on the "hostname" option line for the interface in /e/n/i
+ If the user backs up from netcfg/get_hostname, go to retry question
+ Wait at least two seconds for DHCP client to exit (Closes: #255984)

12
dhcp.c

@ -46,9 +46,7 @@ static void dhcp_client_sigchld(int sig __attribute__ ((unused)))
/*
* This function will start whichever DHCP client is available
* The host-name provided in the dhostname argument is requested
*
* The client should be run such that it dies once a lease is acquired.
* using the provided DHCP hostname, if supplied
*
* The client's PID is stored in dhcp_pid. Once the client dies
* dhcp_pid should be set to -1.
@ -328,7 +326,7 @@ int netcfg_activate_dhcp (struct debconfclient *client)
/*
* Default to the hostname returned via DHCP, if any,
* otherwise to the host-name requested from DHCP
* otherwise to the requested DHCP hostname
* otherwise to the hostname found in DNS for the IP address of the interface
*/
if (
@ -454,7 +452,7 @@ int netcfg_activate_dhcp (struct debconfclient *client)
* Going back to POLL wouldn't make much sense.
* However, it does make sense to go to the retry
* screen where the user can elect to retry DHCP with
* a requested host-name, etc.
* a requested DHCP hostname, etc.
*/
state = ASK_RETRY;
}
@ -464,8 +462,8 @@ int netcfg_activate_dhcp (struct debconfclient *client)
/*
* If we haven't already created the DHCLIENT_CONF file
* (by calling start_dhcp_client() with dhostname set)
* then set up that file now with hostname as the host-name
* to send. See #236533.
* then set up that file now with hostname as the
* DHCP hostname to request. See #236533.
*/
/*
* I don't like this because it changes the DHCLIENT_CONF

Loading…
Cancel
Save