From eb5722fdfe744d681a7315908b5258e474bd1bd2 Mon Sep 17 00:00:00 2001 From: Grischa Zengel Date: Fri, 25 Sep 2015 20:17:47 +0200 Subject: [PATCH 1/2] prevent /etc/init.d/zfs-import from running with systemd zfsonlinux/zfs#3837 For systems with systemd in sysv init compatibility mode you have to prevent that services in /etc/init.d will be executed if there is a equivalent in systemd. There is zfs-import without a corresponding systemd service. --- etc/systemd/system/zfs-import-cache.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in index b1deb6ed9630..27870946fa1d 100644 --- a/etc/systemd/system/zfs-import-cache.service.in +++ b/etc/systemd/system/zfs-import-cache.service.in @@ -5,6 +5,7 @@ Requires=systemd-udev-settle.service After=systemd-udev-settle.service After=cryptsetup.target ConditionPathExists=@sysconfdir@/zfs/zpool.cache +Conflicts=zfs-import.service [Service] Type=oneshot From 428aebf9edee23e2ebc28f540669f87824a2a144 Mon Sep 17 00:00:00 2001 From: Grischa Zengel Date: Fri, 25 Sep 2015 20:19:22 +0200 Subject: [PATCH 2/2] prevent /etc/init.d/zfs-import from running with systemd zfsonlinux/zfs#3837 For systems with systemd in sysv init compatibility mode you have to prevent that services in /etc/init.d will be executed if there is a equivalent in systemd. There is zfs-import without a corresponding systemd service. --- etc/systemd/system/zfs-import-scan.service.in | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in index 517e12e3a26e..bcf439ba17e6 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -5,6 +5,7 @@ Requires=systemd-udev-settle.service After=systemd-udev-settle.service After=cryptsetup.target ConditionPathExists=!@sysconfdir@/zfs/zpool.cache +Conflicts=zfs-import.service [Service] Type=oneshot