diff options
| -rw-r--r-- | man/kernel-command-line.xml | 8 | ||||
| -rw-r--r-- | src/core/hostname-setup.c | 36 |
2 files changed, 32 insertions, 12 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index fd49b65a8d..0f2972a0b6 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -467,6 +467,14 @@ system clock to. The system time is set to the specified timestamp early during boot. It is not propagated to the hardware clock (RTC).</para></listitem> </varlistentry> + + <varlistentry> + <term><varname>systemd.hostname=</varname></term> + + <listitem><para>Accepts a hostname to set during early boot. If specified takes precedence over what + is set in <filename>/etc/hostname</filename>. Note that this does not bar later runtime changes to + the hostname, it simply controls the initial hostname set during early boot.</para></listitem> + </varlistentry> </variablelist> </refsect1> diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c index 83cce88131..6d047db838 100644 --- a/src/core/hostname-setup.c +++ b/src/core/hostname-setup.c @@ -10,29 +10,41 @@ #include "hostname-util.h" #include "log.h" #include "macro.h" +#include "proc-cmdline.h" #include "string-util.h" #include "util.h" int hostname_setup(void) { _cleanup_free_ char *b = NULL; + const char *hn = NULL; bool enoent = false; - const char *hn; int r; - r = read_etc_hostname(NULL, &b); - if (r < 0) { - if (r == -ENOENT) - enoent = true; - else - log_warning_errno(r, "Failed to read configured hostname: %m"); + r = proc_cmdline_get_key("systemd.hostname", 0, &b); + if (r < 0) + log_warning_errno(r, "Failed to retrieve system hostname from kernel command line, ignoring: %m"); + else if (r > 0) { + if (hostname_is_valid(b, true)) + hn = b; + else { + log_warning("Hostname specified on kernel command line is invalid, ignoring: %s", b); + b = mfree(b); + } + } - hn = NULL; - } else - hn = b; + if (!hn) { + r = read_etc_hostname(NULL, &b); + if (r < 0) { + if (r == -ENOENT) + enoent = true; + else + log_warning_errno(r, "Failed to read configured hostname: %m"); + } else + hn = b; + } if (isempty(hn)) { - /* Don't override the hostname if it is already set - * and not explicitly configured */ + /* Don't override the hostname if it is already set and not explicitly configured */ if (hostname_is_set()) return 0; |