zfs: 'want', don't 'require', systemd-udev-settle

This completes changes in #227208
Fixes: #244737, #245089.
This commit is contained in:
Daniel Carosone 2023-07-28 16:57:12 +10:00
parent ef99fa5c5e
commit 4ffc1c82c6

View file

@ -110,10 +110,11 @@ let
createImportService = { pool, systemd, force, prefix ? "" }: createImportService = { pool, systemd, force, prefix ? "" }:
nameValuePair "zfs-import-${pool}" { nameValuePair "zfs-import-${pool}" {
description = "Import ZFS pool \"${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: # In the future, hopefully someone will complete this:
# https://github.com/zfsonlinux/zfs/pull/4943 # https://github.com/zfsonlinux/zfs/pull/4943
requires = [ "systemd-udev-settle.service" ]; wants = [ "systemd-udev-settle.service" ];
after = [ after = [
"systemd-udev-settle.service" "systemd-udev-settle.service"
"systemd-modules-load.service" "systemd-modules-load.service"