From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 22 Feb 2021 23:41:27 +0000 (+0100)
Subject: Merge pull request #18704 from keszybz/fallback-hostame-override
X-Git-Tag: v248-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e5e102baf54f113d22a2be5862d8e42f362ddb;p=thirdparty%2Fsystemd.git

Merge pull request #18704 from keszybz/fallback-hostame-override

Allow overriding of fallback hostname through envvar and os-release field
---

a5e5e102baf54f113d22a2be5862d8e42f362ddb
diff --cc NEWS
index 3ee23811918,b917262495e..50ef954cc87
--- a/NEWS
+++ b/NEWS
@@@ -256,16 -184,12 +256,16 @@@ CHANGES WITH 248
            ignored. The goal is to honour configuration as specified by the
            user.
  
-         * systemd-hostnamed now exports the fallback hostname and the source of
-           the configured hostname ("static", "transient", or "fallback") as
+         * systemd-hostnamed now exports the default hostname and the source of
+           the configured hostname ("static", "transient", or "default") as
            D-Bus properties.
  
 -        * systemd-hostnamed now exports the HardwareVendor and HardwareModel
 -          D-Bus properties. hostnamectl shows this in the status output.
 +        * systemd-hostnamed now exports the "HardwareVendor" and
 +          "HardwareModel" D-Bus properties, which are supposed to contain a
 +          pair of cleaned up, human readable strings describing the system's
 +          vendor and model. It's typically sourced from the firmware's DMI
 +          tables, but may be augmented from a new hwdb database. hostnamectl
 +          shows this in the status output.
  
          * systemd-localed may now call locale-gen to generate missing locales
            on-demand (UTF-8-only). This improves integration with Debian-based
diff --cc docs/ENVIRONMENT.md
index 7eec4559346,07a65864bde..a3916f8cde0
--- a/docs/ENVIRONMENT.md
+++ b/docs/ENVIRONMENT.md
@@@ -42,20 -43,22 +42,24 @@@ All tools
    debugging, in order to test generators and other code against specific kernel
    command lines.
  
 -* `$SYSTEMD_FSTAB` — if set, use this path instead of /etc/fstab. Only useful
 +* `$SYSTEMD_FSTAB` — if set, use this path instead of `/etc/fstab`. Only useful
    for debugging.
  
 -* `$SYSTEMD_CRYPTTAB` — if set, use this path instead of /etc/crypttab. Only
 -  useful for debugging. Currently only supported by systemd-cryptsetup-generator.
 +* `$SYSTEMD_CRYPTTAB` — if set, use this path instead of `/etc/crypttab`. Only
 +  useful for debugging. Currently only supported by
 +  `systemd-cryptsetup-generator`.
  
 -* `$SYSTEMD_VERITYTAB` — if set, use this path instead of /etc/veritytab. Only
 -  useful for debugging. Currently only supported by systemd-veritysetup-generator.
 +* `$SYSTEMD_VERITYTAB` — if set, use this path instead of
 +  `/etc/veritytab`. Only useful for debugging. Currently only supported by
 +  `systemd-veritysetup-generator`.
  
  * `$SYSTEMD_EFI_OPTIONS` — if set, used instead of the string in the
 -  SystemdOptions EFI variable. Analogous to `$SYSTEMD_PROC_CMDLINE`.
 +  `SystemdOptions` EFI variable. Analogous to `$SYSTEMD_PROC_CMDLINE`.
  
+ * `$SYSTEMD_DEFAULT_HOSTNAME` — override the compiled-in fallback hostname
+   (relevant in particular for the system manager and `systemd-hostnamed`).
+   Must be a valid hostname (either a single label or a FQDN).
+ 
  * `$SYSTEMD_IN_INITRD=[auto|lenient|0|1]` — if set, specifies initrd detection
    method. Defaults to `auto`. Behavior is defined as follows:
    `auto`: Checks if `/etc/initrd-release` exists, and a temporary fs is mounted