diff options
| author | Florian Klink <flokli@flokli.de> | 2023-09-10 16:07:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-10 16:07:44 +0200 |
| commit | 688d95b6e6c1a1a0fb91be7b80bff228b20c8024 (patch) | |
| tree | 8384f15f4bb36b224cc3718498d1969b4787f0af /nixos/modules/system | |
| parent | 7605b083cde721f56e3e7bcef5bc1ff96301a6f4 (diff) | |
| parent | 5061d9daf0e3960dac85948de775497f81b509e8 (diff) | |
| download | nixlib-688d95b6e6c1a1a0fb91be7b80bff228b20c8024.tar nixlib-688d95b6e6c1a1a0fb91be7b80bff228b20c8024.tar.gz nixlib-688d95b6e6c1a1a0fb91be7b80bff228b20c8024.tar.bz2 nixlib-688d95b6e6c1a1a0fb91be7b80bff228b20c8024.tar.lz nixlib-688d95b6e6c1a1a0fb91be7b80bff228b20c8024.tar.xz nixlib-688d95b6e6c1a1a0fb91be7b80bff228b20c8024.tar.zst nixlib-688d95b6e6c1a1a0fb91be7b80bff228b20c8024.zip | |
Merge pull request #254056 from n8henrie/master
Include note about systemd default watchdog reboot time
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index ac55461107fb..b6c3085c4f16 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -395,7 +395,9 @@ in description = lib.mdDoc '' The amount of time which can elapse after a reboot has been triggered before a watchdog hardware device will automatically reboot the system. - Valid time units include "ms", "s", "min", "h", "d", and "w". + Valid time units include "ms", "s", "min", "h", "d", and "w". If left + `null`, systemd will use its default of `10min`; see also {command}`man + 5 systemd-system.conf`. ''; }; |