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

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

diff --cc NEWS
index 3ee238119188f5d19c32abd5602d5d579ede3369,b917262495e0ee44b1860e7a28cddd526421472c..50ef954cc872ecf7065288c5da98efc570f27a6a
--- 1/NEWS
--- 2/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 7eec45593464f16dde61719a022e2c214dc756a8,07a65864bdebfcf04c9818b239af923092e13355..a3916f8cde0e427509252e9b1dce2027cab2b3fe
--- 1/docs/ENVIRONMENT.md
--- 2/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

diff --cc man/systemd.unit.xml
Simple merge

diff --cc src/basic/meson.build
Simple merge

diff --cc src/core/main.c
Simple merge

diff --cc src/shared/conf-parser.c
Simple merge