diff options
| author | Daniel Carosone <dan@geek.com.au> | 2023-07-28 16:57:12 +1000 |
|---|---|---|
| committer | Daniel Carosone <dan@geek.com.au> | 2023-07-28 16:57:12 +1000 |
| commit | 4ffc1c82c6abb61aebf1a452020a4d41201e89e7 (patch) | |
| tree | ced1cb290435e0a21ec4e1fea474f297099dccd8 | |
| parent | ef99fa5c5ed624460217c31ac4271cfb5cb2502c (diff) | |
| download | nixpkgs-4ffc1c82c6abb61aebf1a452020a4d41201e89e7.tar nixpkgs-4ffc1c82c6abb61aebf1a452020a4d41201e89e7.tar.gz nixpkgs-4ffc1c82c6abb61aebf1a452020a4d41201e89e7.tar.bz2 nixpkgs-4ffc1c82c6abb61aebf1a452020a4d41201e89e7.tar.lz nixpkgs-4ffc1c82c6abb61aebf1a452020a4d41201e89e7.tar.xz nixpkgs-4ffc1c82c6abb61aebf1a452020a4d41201e89e7.tar.zst nixpkgs-4ffc1c82c6abb61aebf1a452020a4d41201e89e7.zip | |
zfs: 'want', don't 'require', systemd-udev-settle
This completes changes in #227208 Fixes: #244737, #245089.
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index e148446540b..21d604bee6e 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -110,10 +110,11 @@ let createImportService = { pool, systemd, force, prefix ? "" }: nameValuePair "zfs-import-${pool}" { description = "Import ZFS pool \"${pool}\""; - # we need systemd-udev-settle to ensure devices are available + # We wait for systemd-udev-settle to ensure devices are available, + # but don't *require* it, because mounts shouldn't be killed if it's stopped. # In the future, hopefully someone will complete this: # https://github.com/zfsonlinux/zfs/pull/4943 - requires = [ "systemd-udev-settle.service" ]; + wants = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" "systemd-modules-load.service" |