about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSimonas Kazlauskas <git@kazlauskas.me>2024-02-10 22:25:24 +0200
committerSimonas Kazlauskas <git@kazlauskas.me>2024-02-10 22:25:24 +0200
commitfd5664871fb33e2a9f8e0b023e568958aa959ad8 (patch)
tree886caf001b94ceefab180c7bb2586a8416bc6e4a /nixos
parent74eeb75af1ea94c2f639a843172ee2fc82f5cf54 (diff)
downloadnixlib-fd5664871fb33e2a9f8e0b023e568958aa959ad8.tar
nixlib-fd5664871fb33e2a9f8e0b023e568958aa959ad8.tar.gz
nixlib-fd5664871fb33e2a9f8e0b023e568958aa959ad8.tar.bz2
nixlib-fd5664871fb33e2a9f8e0b023e568958aa959ad8.tar.lz
nixlib-fd5664871fb33e2a9f8e0b023e568958aa959ad8.tar.xz
nixlib-fd5664871fb33e2a9f8e0b023e568958aa959ad8.tar.zst
nixlib-fd5664871fb33e2a9f8e0b023e568958aa959ad8.zip
review
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-2405.section.md4
-rw-r--r--nixos/lib/systemd-unit-options.nix8
2 files changed, 5 insertions, 7 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index 05c06ebcac1b..e11524f0de8a 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -286,6 +286,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
   [fileSystems.overlay](#opt-fileSystems._name_.overlay.lowerdir). See also the
   [NixOS docs](#sec-overlayfs).
 
+- systemd units can now specify the `Upholds=` and `UpheldBy=` unit dependencies via the aptly
+  named `upholds` and `upheldBy` options. These options get systemd to enforce that the
+  dependencies remain continuosly running for as long as the dependent unit is in a running state.
+
 - `stdenv`: The `--replace` flag in `substitute`, `substituteInPlace`, `substituteAll`, `substituteAllStream`, and `substituteStream` is now deprecated if favor of the new `--replace-fail`, `--replace-warn` and `--replace-quiet`. The deprecated `--replace` equates to `--replace-warn`.
 
 - A new hardening flag, `zerocallusedregs` was made available, corresponding to the gcc/clang option `-fzero-call-used-regs=used-gpr`.
diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix
index 9a0fedeb0b2d..df05d165d9e8 100644
--- a/nixos/lib/systemd-unit-options.nix
+++ b/nixos/lib/systemd-unit-options.nix
@@ -160,13 +160,7 @@ in rec {
         default = [];
         type = types.listOf unitNameType;
         description = lib.mdDoc ''
-          Configures dependencies similar to Wants=, but as long as this unit is up, all units
-          listed in Upholds= are started whenever found to be inactive or failed, and no job is
-          queued for them. While a Wants= dependency on another unit has a one-time effect when
-          this units started, a Upholds= dependency on it has a continuous effect, constantly
-          restarting the unit if necessary. This is an alternative to the Restart= setting of
-          service units, to ensure they are kept running whatever happens. The restart happens
-          without delay, and usual per-unit rate-limit applies.
+          Keeps the specified running while this unit is running. A continuous version of `wants`.
         '';
       };