]> git.baikalelectronics.ru Git - kernel.git/commit
net: ipconfig: Don't override command-line hostnames or domains
authorJosh Triplett <josh@joshtriplett.org>
Wed, 2 Jun 2021 01:38:41 +0000 (18:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Jun 2021 20:27:03 +0000 (13:27 -0700)
commitb508d5fb69c2211a1b860fc058aafbefc3b3c3cd
treecc34cd01c5f7c13661b418a51240750e11cbc049
parentdd62766239d54e00201a6a75b6b348f816bb96af
net: ipconfig: Don't override command-line hostnames or domains

If the user specifies a hostname or domain name as part of the ip=
command-line option, preserve it and don't overwrite it with one
supplied by DHCP/BOOTP.

For instance, ip=::::myhostname::dhcp will use "myhostname" rather than
ignoring and overwriting it.

Fix the comment on ic_bootp_string that suggests it only copies a string
"if not already set"; it doesn't have any such logic.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipconfig.c