uts: make default hostname configurable, rather than always using "(none)"
The "hostname" tool falls back to setting the hostname to "localhost" if /etc/hostname does not exist. Distribution init scripts have the same fallback. However, if userspace never calls sethostname, such as when booting with init=/bin/sh, or otherwise booting a minimal system without the usual init scripts, the default hostname of "(none)" remains, unhelpfully appearing in various places such as prompts ("root@(none):~#") and logs. Furthermore, "(none)" doesn't typically resolve to anything useful. Make the default hostname configurable. This removes the need for the standard fallback, provides a useful default for systems that never call sethostname, and makes minimal systems that much more useful with less configuration. Distributions could choose to use "localhost" here to avoid the fallback, while embedded systems may wish to use a specific target hostname. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: David Miller <davem@davemloft.net> Cc: Serge Hallyn <serue@us.ibm.com> Cc: Kel Modderman <kel@otaku42.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ca39599c63
commit
bd5dc17be8
2 changed files with 10 additions and 1 deletions
|
@ -9,7 +9,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef UTS_NODENAME
|
||||
#define UTS_NODENAME "(none)" /* set by sethostname() */
|
||||
#define UTS_NODENAME CONFIG_DEFAULT_HOSTNAME /* set by sethostname() */
|
||||
#endif
|
||||
|
||||
#ifndef UTS_DOMAINNAME
|
||||
|
|
|
@ -204,6 +204,15 @@ config KERNEL_LZO
|
|||
|
||||
endchoice
|
||||
|
||||
config DEFAULT_HOSTNAME
|
||||
string "Default hostname"
|
||||
default "(none)"
|
||||
help
|
||||
This option determines the default system hostname before userspace
|
||||
calls sethostname(2). The kernel traditionally uses "(none)" here,
|
||||
but you may wish to use a different default here to make a minimal
|
||||
system more usable with less configuration.
|
||||
|
||||
config SWAP
|
||||
bool "Support for paging of anonymous memory (swap)"
|
||||
depends on MMU && BLOCK
|
||||
|
|
Loading…
Reference in a new issue