TODO

@@ -1392,6 +1392,9 @@ Features:
 * chase(): take inspiration from path_extract_filename() and return
   O_DIRECTORY if input path contains trailing slash.
 
+* document in boot loader spec that symlinks in XBOOTLDR/ESP are not OK even if
+  non-VFAT fs is used.
+
 * measure credentials picked up from SMBIOS to some suitable PCR
 
 * measure GPT and LUKS headers somewhere when we use them (i.e. in
@@ -2316,11 +2319,9 @@ Features:
   ConditionConfigSearchPathNotEmpty= or different syntax? See the discussion starting at
   https://github.com/systemd/systemd/pull/15109#issuecomment-607740136.
 
-* BootLoaderSpec: define a way how an installer can figure out whether a BLS
+* BootLoaderSpec: Define a way how an installer can figure out whether a BLS
   compliant boot loader is installed.
 
-* BootLoaderSpec: document @saved pseudo-entry, update mention in BLI
-
 * think about requeuing jobs when daemon-reload is issued? use case:
   the initrd issues a reload after fstab from the host is accessible
   and we might want to requeue the mounts local-fs acquired through

docs/BOOT_LOADER_INTERFACE.md

@@ -7,97 +7,84 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 
 # The Boot Loader Interface
 
-systemd can interface with the boot loader
+systemd can interface with the boot loader to receive performance data and
-to receive performance data and other information,
+other information, and pass control information. This is only supported on EFI
-and pass control information.
+systems. Data is transferred between the boot loader and systemd in EFI
-This is only supported on EFI systems.
+variables. All EFI variables use the vendor UUID
-Data is transferred between the boot loader and systemd in EFI variables.
+`4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`.
-All EFI variables use the vendor UUID `4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`.
-Variables will be listed below using the Linux efivarfs naming,
-`<name>-<vendoruuid>`.
 
-* The EFI Variable `LoaderTimeInitUSec-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI Variable `LoaderTimeInitUSec` contains the timestamp in microseconds
-  contains the timestamp in microseconds when the loader was initialized.
+  when the loader was initialized. This value is the time spent in the firmware
-  This value is the time spent in the firmware for initialization.
+  for initialization, it is formatted as numeric, NUL-terminated, decimal
-  It is formatted as numeric, NUL-terminated, decimal string, in UTF-16.
+  string, in UTF-16.
 
-* The EFI Variable `LoaderTimeExecUSec-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI Variable `LoaderTimeExecUSec` contains the timestamp in microseconds
-  contains the timestamp in microseconds when the loader finished its work and is about to execute the kernel.
+  when the loader finished its work and is about to execute the kernel. The
-  The time spent in the loader is the difference between `LoaderTimeExecUSec` and `LoaderTimeInitUSec`.
+  time spent in the loader is the difference between `LoaderTimeExecUSec` and
-  This value is formatted the same way as `LoaderTimeInitUSec`.
+  `LoaderTimeInitUSec`. This value is formatted the same way as
+  `LoaderTimeInitUSec`.
 
-* The EFI variable `LoaderDevicePartUUID-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderDevicePartUUID` contains the partition GUID of the
-  contains the partition GUID of the ESP the boot loader was run from
+  ESP the boot loader was run from formatted as NUL-terminated UTF16 string, in
-  formatted as NUL-terminated UTF16 string, in normal GUID syntax.
+  normal GUID syntax.
 
-* The EFI variable `LoaderConfigTimeout-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderConfigTimeout` contains the boot menu timeout
-  contains the boot menu timeout currently in use.
+  currently in use. It may be modified both by the boot loader and by the
-  It may be modified both by the boot loader and by the host.
+  host. The value should be formatted as numeric, NUL-terminated, decimal
-  The value should be formatted as numeric, NUL-terminated, decimal string, in UTF-16.
+  string, in UTF-16. The time is specified in seconds. In addition some
-  The time is specified in seconds.
+  non-numeric string values are also accepted. A value of `menu-force`
-  In addition some non-numeric string values are also accepted.
+  will disable the timeout and show the menu indefinitely. If set to `0` or
-  A value of `menu-force` will disable the timeout and show the menu indefinitely.
+  `menu-hidden` the default entry is booted immediately without showing a menu.
-  If set to `0` or `menu-hidden` the default entry is booted immediately without showing a menu.
+  Unless a value of `menu-disabled` is set, the boot loader should provide a
-  Unless a value of `menu-disabled` is set,
+  way to interrupt this by for example listening for key presses for a brief
-  the boot loader should provide a way to interrupt this
+  moment before booting.
-  by for example listening for key presses for a brief moment before booting.
 
-* Similarly, the EFI variable `LoaderConfigTimeoutOneShot-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* Similarly, the EFI variable `LoaderConfigTimeoutOneShot` contains a boot menu
-  contains a boot menu timeout for a single following boot.
+  timeout for a single following boot. It is set by the OS in order to request
-  It is set by the OS in order to request display of the boot menu on the following boot.
+  display of the boot menu on the following boot. When set overrides
-  When set overrides `LoaderConfigTimeout`.
+  `LoaderConfigTimeout`. It is removed automatically after being read by the
-  It is removed automatically after being read by the boot loader,
+  boot loader, to ensure it only takes effect a single time. This value is
-  to ensure it only takes effect a single time.
+  formatted the same way as `LoaderConfigTimeout`. If set to `0` the boot menu
-  This value is formatted the same way as `LoaderConfigTimeout`.
+  timeout is turned off, and the menu is shown indefinitely.
-  If set to `0` the boot menu timeout is turned off,
-  and the menu is shown indefinitely.
 
-* The EFI variable `LoaderEntries-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderEntries` may contain a series of boot loader entry
-  may contain a series of boot loader entry identifiers,
+  identifiers, one after the other, each individually NUL terminated. This may
-  one after the other, each individually NUL terminated.
+  be used to let the OS know which boot menu entries were discovered by the
-  This may be used to let the OS know which boot menu entries were discovered by the boot loader.
+  boot loader. A boot loader entry identifier should be a short, non-empty
-  A boot loader entry identifier should be a short, non-empty alphanumeric string
+  alphanumeric string (possibly containing `-`, too). The list should be in the
-  (possibly containing `-`, too).
+  order the entries are shown on screen during boot. See below regarding the
-  The list should be in the order the entries are shown on screen during boot.
+  recommended vocabulary for boot loader entry identifiers.
-  See below regarding the recommended vocabulary for boot loader entry identifiers.
 
-* The EFI variable `LoaderEntryDefault-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderEntryDefault` contains the default boot loader entry
-  contains the default boot loader entry to use.
+  to use. It contains a NUL-terminated boot loader entry identifier.
-  It contains a NUL-terminated boot loader entry identifier.
 
-* The EFI variable `LoaderEntrySysFail-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderEntrySysFail` specifies the boot loader entry to be
-  specifies the boot loader entry to be used in case of a system failure.
+  used in case of a system failure. System failure (SysFail) boot entries can
-  System failure (SysFail) boot entries
+  optionally modify the automatic selection order in the event of a failure,
-  can optionally modify the automatic selection order in the event of a failure,
+  such as a boot firmware update failure with the failure status recorded in
-  such as a boot firmware update failure with the failure status recorded in the EFI system table.
+  the EFI system table. If a system failure occurs and `LoaderEntrySysFail` is
-  If a system failure occurs and `LoaderEntrySysFail` is set,
+  set, systemd-boot will use this boot entry, and store the actual SysFail
-  systemd-boot will use this boot entry,
+  reason in the `LoaderSysFailReason` EFI variable.
-  and store the actual SysFail reason in the `LoaderSysFailReason` EFI variable.
 
-* The EFI variable `LoaderSysFailReason-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderSysFailReason` contains the system failure reason.
-  contains the system failure reason.
   This variable is used in cooperation with `LoaderEntrySysFail` boot entry.
   If system failure doesn't occur, `LoaderSysFailReason` is not set.
 
-* Similarly, the EFI variable `LoaderEntryOneShot-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* Similarly, the EFI variable `LoaderEntryOneShot` contains the default boot
-  contains the default boot loader entry to use for a single following boot.
+  loader entry to use for a single following boot. It is set by the OS in order
-  It is set by the OS
+  to request booting into a specific menu entry on the following boot. When set
-  in order to request booting into a specific menu entry on the following boot.
+  overrides `LoaderEntryDefault`. It is removed automatically after being read
-  When set overrides `LoaderEntryDefault`.
+  by the boot loader, to ensure it only takes effect a single time. This value
-  It is removed automatically after being read by the boot loader,
+  is formatted the same way as `LoaderEntryDefault`.
-  to ensure it only takes effect a single time.
-  This value is formatted the same way as `LoaderEntryDefault`.
 
-* The EFI variable `LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderEntrySelected` contains the boot loader entry
-  contains the boot loader entry identifier that was booted.
+  identifier that was booted. It is set by the boot loader and read by
-  It is set by the boot loader and read by the OS
+  the OS in order to identify which entry has been used for the current boot.
-  in order to identify which entry has been used for the current boot.
 
-* The EFI variable `LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderFeatures` contains a 64-bit unsigned integer with a
-  contains a 64-bit unsigned integer with a number of flags bits
+  number of flags bits that are set by the boot loader and passed to the OS and
-  that are set by the boot loader and passed to the OS
+  indicate the features the boot loader supports. Specifically, the following
-  and indicate the features the boot loader supports.
+  bits are defined:
-  Specifically, the following bits are defined:
 
   * `1 << 0` → The boot loader honours `LoaderConfigTimeout` when set.
   * `1 << 1` → The boot loader honours `LoaderConfigTimeoutOneShot` when set.
@@ -106,53 +93,29 @@ Variables will be listed below using the Linux efivarfs naming,
   * `1 << 4` → The boot loader supports boot counting as described in [Automatic Boot Assessment](/AUTOMATIC_BOOT_ASSESSMENT).
   * `1 << 5` → The boot loader supports looking for boot menu entries in the Extended Boot Loader Partition.
   * `1 << 6` → The boot loader supports passing a random seed to the OS.
-  * `1 << 7` → The boot loader supports loading of drop-in drivers from the `/EFI/systemd/drivers/` directory on the ESP,
-               see [`systemd-boot(7)`](https://www.freedesktop.org/software/systemd/man/systemd-boot.html).
-  * `1 << 8` → The boot loader supports the `sort-key` field defined by the
-               [Boot Loader Specification](https://uapi-group.org/specifications/specs/boot_loader_specification).
-  * `1 << 9` → The boot loader supports the `@saved` pseudo-entry
-  * `1 << 10` → The boot loader supports the `devicetree` field defined by the
-                [Boot Loader Specification](https://uapi-group.org/specifications/specs/boot_loader_specification).
-  * `1 << 11` → The boot loader support automatic enrollment of SecureBoot keys,
-                see [`systemd-boot(7)`](https://www.freedesktop.org/software/systemd/man/systemd-boot.html).
-  * `1 << 12` → The boot loader will set EFI variable `ShimRetainProtocol-605dab50-e046-4300-abb6-3dd810dd8b23`
-                for `shim` to make its protocol available to the booted binary.
   * `1 << 13` → The boot loader honours `menu-disabled` option when set.
-  * `1 << 14` → The boot loader supports multi-profile Unified Kernel Images (UKIs)
-  * `1 << 15` → The boot loader sets the `LoaderDeviceURL` variable when appropriate.
-  * `1 << 16` → The boot loader supports the `uki` field defined by the
-                [Boot Loader Specification](https://uapi-group.org/specifications/specs/boot_loader_specification).
-  * `1 << 17` → The boot loader supports the `uki-url` field defined by the
-                [Boot Loader Specification](https://uapi-group.org/specifications/specs/boot_loader_specification).
-  * `1 << 18` → The boot loader reports active TPM2 PCR banks in the
-                EFI variable `LoaderTpm2ActivePcrBanks-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`.
 
-* The EFI variable `LoaderSystemToken-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderSystemToken` contains binary random data,
-  contains binary random data,
+  persistently set by the OS installer. Boot loaders that support passing
-  persistently set by the OS installer.
+  random seeds to the OS should use this data and combine it with the random
-  Boot loaders that support passing random seeds to the OS
+  seed file read from the ESP. By combining this random data with the random
-  should use this data and combine it with the random seed file read from the ESP.
+  seed read off the disk before generating a seed to pass to the OS and a new
-  By combining this random data with the random seed read off the disk
+  seed to store in the ESP the boot loader can protect itself from situations
-  before generating a seed to pass to the OS and a new seed to store in the ESP
+  where "golden" OS images that include a random seed are replicated and used
-  the boot loader can protect itself from situations where
+  on multiple systems. Since the EFI variable storage is usually independent
-  "golden" OS images that include a random seed are replicated and used on multiple systems.
+  (i.e. in physical NVRAM) of the ESP file system storage, and only the latter
-  Since the EFI variable storage is usually independent
+  is part of "golden" OS images, this ensures that different systems still come
-  (i.e. in physical NVRAM) of the ESP file system storage,
+  up with different random seeds. Note that the `LoaderSystemToken` is
-  and only the latter is part of "golden" OS images,
+  generally only written once, by the OS installer, and is usually not touched
-  this ensures that different systems still come up with different random seeds.
+  after that.
-  Note that the `LoaderSystemToken` is generally only written once,
-  by the OS installer,
-  and is usually not touched after that.
 
-* The EFI variable `LoaderDeviceURL-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderDeviceURL` contains the URL the boot loader was
-  contains the URL the boot loader was downloaded from,
+  downloaded from, in UTF-16 format. Only set in case of network boots.
-  in UTF-16 format.
-  Only set in case of network boots.
 
-* The EFI variable `LoaderTpm2ActivePcrBanks-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f`
+* The EFI variable `LoaderTpm2ActivePcrBanks` contains a hexadecimal string
-  contains a hexadecimal string representation of a bitmask with values defined by
+  representation of a bitmask with values defined by the TCG EFI Protocol
-  the TCG EFI ProtocolSpecification for TPM 2.0 as `EFI_TCG2_BOOT_HASH_ALG_*`.
+  Specification for TPM 2.0 as EFI_TCG2_BOOT_HASH_ALG_*. If no TPM2 support or
-  If no TPM2 support or no active banks were detected, will be set to `0`.
+  no active banks were detected, will be set to `0`.
 
 If `LoaderTimeInitUSec` and `LoaderTimeExecUSec` are set, `systemd-analyze`
 will include them in its boot-time analysis.  If `LoaderDevicePartUUID` is set,
@@ -165,11 +128,12 @@ variables.
 
 ## Boot Loader Entry Identifiers
 
-While boot loader entries may be named relatively freely,
+While boot loader entries may be named relatively freely, it's highly
-it's highly recommended to follow the following rules when picking identifiers for the entries,
+recommended to follow the following rules when picking identifiers for the
-so that programs (and users) can derive basic context and meaning from the identifiers
+entries, so that programs (and users) can derive basic context and meaning from
-as passed in `LoaderEntries`, `LoaderEntryDefault`, `LoaderEntryOneShot`, `LoaderEntrySelected`,
+the identifiers as passed in `LoaderEntries`, `LoaderEntryDefault`,
-and possibly show nicely localized names for them in UIs.
+`LoaderEntryOneShot`, `LoaderEntrySelected`, and possibly show nicely localized
+names for them in UIs.
 
 1. When boot loader entries are defined through the
    [BOOT.1 Boot Loader Specification](https://uapi-group.org/specifications/specs/boot_loader_specification/)
@@ -177,30 +141,29 @@ and possibly show nicely localized names for them in UIs.
    but with the `.conf` (Type #1 snippets) or `.efi` (Type #2 images)
    suffix removed.
 
-2. Entries automatically discovered by the boot loader
+2. Entries automatically discovered by the boot loader (as opposed to being
-   (as opposed to being configured in configuration files)
+   configured in configuration files) should generally have an identifier
-   should generally have an identifier prefixed with `auto-`.
+   prefixed with `auto-`.
 
-3. Boot menu entries referring to Microsoft Windows installations
+3. Boot menu entries referring to Microsoft Windows installations should either
-   should either use the identifier `windows`
+   use the identifier `windows` or use the `windows-` prefix for the
-   or use the `windows-` prefix for the identifier.
+   identifier. If a menu entry is automatically discovered, it should be
-   If a menu entry is automatically discovered,
+   prefixed with `auto-`, see above (Example: this means an automatically
-   it should be prefixed with `auto-`, see above.
+   discovered Windows installation might have the identifier `auto-windows` or
-   (Example: this means an automatically discovered Windows installation
+   `auto-windows-10` or so.).
-   might have the identifier `auto-windows` or `auto-windows-10` or so.).
 
-4. Similarly, boot menu entries referring to Apple macOS installations
+4. Similarly, boot menu entries referring to Apple macOS installations should
-   should use the identifier `osx` or one that is prefixed with `osx-`.
+   use the identifier `osx` or one that is prefixed with `osx-`. If such an
-   If such an entry is automatically discovered by the boot loader use `auto-osx` as identifier,
+   entry is automatically discovered by the boot loader use `auto-osx` as
-   or `auto-osx-` as prefix for the identifier, see above.
+   identifier, or `auto-osx-` as prefix for the identifier, see above.
 
-5. If a boot menu entry encapsulates the EFI shell program,
+5. If a boot menu entry encapsulates the EFI shell program, it should use the
-   it should use the identifier `efi-shell`
+   identifier `efi-shell` (or when automatically discovered: `auto-efi-shell`,
-   (or when automatically discovered: `auto-efi-shell`, see above).
+   see above).
 
 6. If a boot menu entry encapsulates a reboot into EFI firmware setup feature,
-   it should use the identifier `reboot-to-firmware-setup`
+   it should use the identifier `reboot-to-firmware-setup` (or
-   (or `auto-reboot-to-firmware-setup` in case it is automatically discovered).
+   `auto-reboot-to-firmware-setup` in case it is automatically discovered).
 
 ## Links
 

man/systemd-boot.xml

@@ -57,7 +57,7 @@
       <listitem><para>A <literal>Reboot Into Firmware Interface</literal> option, if supported by the UEFI
       firmware.</para></listitem>
 
-      <listitem><para>Secure Boot variable enrollment if the UEFI firmware is in setup mode and files are provided
+      <listitem><para>Secure Boot variables enrollment if the UEFI firmware is in setup-mode and files are provided
       on the ESP.</para></listitem>
     </itemizedlist>
 
@@ -97,7 +97,7 @@
       entropy pool initialization, providing a full entropy pool during early boot.</para></listitem>
 
       <listitem><para>The boot manager allows for Secure Boot variables to be enrolled if the UEFI firmware is
-      in setup mode. Additionally, variables can be automatically enrolled if configured.</para></listitem>
+      in setup-mode. Additionally, variables can be automatically enrolled if configured.</para></listitem>
     </itemizedlist>
 
     <para><citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -386,8 +386,8 @@
     <para>During initialization, <command>systemd-boot</command> automatically loads all driver files placed
     in the <filename>/EFI/systemd/drivers/</filename> directory of the ESP. The files placed there must have
     an extension of the EFI architecture ID followed by <filename>.efi</filename> (e.g. for x86-64 this means
-    a suffix of <filename>x64.efi</filename>). This may be used e.g. to add support for hardware not
+    a suffix of <filename>x64.efi</filename>). This may be used to automatically load file system drivers and
-    supported natively by the firmware.</para>
+    similar, to extend the native firmware support.</para>
 
     <para>Enrollment of Secure Boot variables can be performed manually or automatically if files are available
     under <filename>/loader/keys/<replaceable>NAME</replaceable>/{db,dbx,KEK,PK}.auth</filename>, <replaceable>NAME</replaceable>

meson.version

@@ -1 +1 @@
-260~devel
+259~rc3

src/bootctl/bootctl-status.c

@@ -424,7 +424,7 @@ int verb_status(int argc, char *argv[], void *userdata) {
                         { EFI_LOADER_FEATURE_REPORT_URL,              "Loader reports network boot URL"       },
                         { EFI_LOADER_FEATURE_TYPE1_UKI,               "Support Type #1 uki field"             },
                         { EFI_LOADER_FEATURE_TYPE1_UKI_URL,           "Support Type #1 uki-url field"         },
-                        { EFI_LOADER_FEATURE_TPM2_ACTIVE_PCR_BANKS,   "Loader reports active TPM2 PCR banks"  },
+                        { EFI_LOADER_FEATURE_TPM2_ACTIVE_PCR_BANKS,   "Loader reports TPM2 active PCR banks"  },
                 };
                 static const struct {
                         uint64_t flag;

src/core/automount.c

@@ -324,7 +324,7 @@ static void automount_dump(Unit *u, FILE *f, const char *prefix) {
 static void automount_enter_dead(Automount *a, AutomountResult f) {
         assert(a);
 
-        if (a->result == AUTOMOUNT_SUCCESS || IN_SET(f, AUTOMOUNT_FAILURE_MOUNT_START_LIMIT_HIT, AUTOMOUNT_FAILURE_START_LIMIT_HIT))
+        if (a->result == AUTOMOUNT_SUCCESS)
                 a->result = f;
 
         unit_log_result(UNIT(a), a->result == AUTOMOUNT_SUCCESS, automount_result_to_string(a->result));

src/core/mount.c

@@ -893,7 +893,7 @@ static int mount_spawn(Mount *m, ExecCommand *c, ExecFlags flags, PidRef *ret_pi
 static void mount_enter_dead(Mount *m, MountResult f, bool flush_result) {
         assert(m);
 
-        if (m->result == MOUNT_SUCCESS || f == MOUNT_FAILURE_START_LIMIT_HIT || flush_result)
+        if (m->result == MOUNT_SUCCESS || flush_result)
                 m->result = f;
 
         unit_log_result(UNIT(m), m->result == MOUNT_SUCCESS, mount_result_to_string(m->result));

src/core/path.c

@@ -502,7 +502,7 @@ static int path_coldplug(Unit *u) {
 static void path_enter_dead(Path *p, PathResult f) {
         assert(p);
 
-        if (p->result == PATH_SUCCESS || IN_SET(f, PATH_FAILURE_START_LIMIT_HIT, PATH_FAILURE_UNIT_START_LIMIT_HIT))
+        if (p->result == PATH_SUCCESS)
                 p->result = f;
 
         unit_log_result(UNIT(p), p->result == PATH_SUCCESS, path_result_to_string(p->result));

src/core/service.c

@@ -2115,7 +2115,7 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
         if (unit_stop_pending(UNIT(s)))
                 allow_restart = false;
 
-        if (s->result == SERVICE_SUCCESS || f == SERVICE_FAILURE_START_LIMIT_HIT)
+        if (s->result == SERVICE_SUCCESS)
                 s->result = f;
 
         if (s->result == SERVICE_SUCCESS) {

src/core/socket.c

@@ -2116,7 +2116,7 @@ static int socket_chown(Socket *s, PidRef *ret_pid) {
 static void socket_enter_dead(Socket *s, SocketResult f) {
         assert(s);
 
-        if (s->result == SOCKET_SUCCESS || IN_SET(f, SOCKET_FAILURE_SERVICE_START_LIMIT_HIT, SOCKET_FAILURE_START_LIMIT_HIT))
+        if (s->result == SOCKET_SUCCESS)
                 s->result = f;
 
         if (s->result == SOCKET_SUCCESS)

src/core/swap.c

@@ -668,7 +668,7 @@ static int swap_spawn(Swap *s, ExecCommand *c, PidRef *ret_pid) {
 static void swap_enter_dead(Swap *s, SwapResult f) {
         assert(s);
 
-        if (s->result == SWAP_SUCCESS || f == SWAP_FAILURE_START_LIMIT_HIT)
+        if (s->result == SWAP_SUCCESS)
                 s->result = f;
 
         unit_log_result(UNIT(s), s->result == SWAP_SUCCESS, swap_result_to_string(s->result));

src/core/timer.c

@@ -324,7 +324,7 @@ static int timer_coldplug(Unit *u) {
 static void timer_enter_dead(Timer *t, TimerResult f) {
         assert(t);
 
-        if (t->result == TIMER_SUCCESS || f == TIMER_FAILURE_START_LIMIT_HIT)
+        if (t->result == TIMER_SUCCESS)
                 t->result = f;
 
         unit_log_result(UNIT(t), t->result == TIMER_SUCCESS, timer_result_to_string(t->result));

test/units/TEST-07-PID1.issue-3166.sh

@@ -14,4 +14,3 @@ while [[ "$active_state" == "activating" || "$active_state" =~ ^(in)?active$ ]];
 done
 systemctl is-failed issue3166-fail-on-restart.service || exit 1
 [[ "$(systemctl show --value --property NRestarts issue3166-fail-on-restart.service)" -le 3 ]] || exit 1
-[[ "$(systemctl show --value --property Result issue3166-fail-on-restart.service)" = "start-limit-hit" ]] || exit 1