From b2a54a28b5ebad7165bbf10bd4de8066a6bf335d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sat, 28 Nov 2020 11:11:18 -0800 Subject: [PATCH] Verify zfs module loaded before starting services Extend the change made in ae12b02 to verify the zfs kernel modules are loaded to the rest of the OpenZFS services. If the modules aren't loaded the neither the share, volume, or and zed services can be started. Signed-off-by: Brian Behlendorf Closes #11243 --- etc/systemd/system/zfs-share.service.in | 1 + etc/systemd/system/zfs-volume-wait.service.in | 1 + etc/systemd/system/zfs-zed.service.in | 1 + 3 files changed, 3 insertions(+) diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in index b720085874e5..745077513c30 100644 --- a/etc/systemd/system/zfs-share.service.in +++ b/etc/systemd/system/zfs-share.service.in @@ -8,6 +8,7 @@ Wants=zfs-mount.service After=zfs-mount.service PartOf=nfs-server.service nfs-kernel-server.service PartOf=smb.service +ConditionPathIsDirectory=/sys/module/zfs [Service] Type=oneshot diff --git a/etc/systemd/system/zfs-volume-wait.service.in b/etc/systemd/system/zfs-volume-wait.service.in index 75bd9fcdd56c..4c77724d8bbb 100644 --- a/etc/systemd/system/zfs-volume-wait.service.in +++ b/etc/systemd/system/zfs-volume-wait.service.in @@ -3,6 +3,7 @@ Description=Wait for ZFS Volume (zvol) links in /dev DefaultDependencies=no After=systemd-udev-settle.service After=zfs-import.target +ConditionPathIsDirectory=/sys/module/zfs [Service] Type=oneshot diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in index f4313625ee5e..008075138f02 100644 --- a/etc/systemd/system/zfs-zed.service.in +++ b/etc/systemd/system/zfs-zed.service.in @@ -1,6 +1,7 @@ [Unit] Description=ZFS Event Daemon (zed) Documentation=man:zed(8) +ConditionPathIsDirectory=/sys/module/zfs [Service] ExecStart=@sbindir@/zed -F