Cleanup systemd dependencies

Some redundancy is present in the systemd dependencies, as
noticed in PR#6764. Existing setups might rely on these quirks,
so these cleanups have been moved to the development branch.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>
Closes #6822

diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in
index 4d82778e35ba7d60a76cb7c96f4f1465e13461e4..884a69b5b68371849000136d2bea0959d5b0ad66 100644 (file)
--- a/etc/systemd/system/50-zfs.preset.in
+++ b/etc/systemd/system/50-zfs.preset.in
@@ -1,6 +1,7 @@
 # ZFS is enabled by default
 enable zfs-import-cache.service
 disable zfs-import-scan.service
+enable zfs-import.target
 enable zfs-mount.service
 enable zfs-share.service
 enable zfs-zed.service

diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in
index 1c207f7421f4a8aa4aa0e3e707a99bbba7ea7f78..b37f2bc7f24c606536d9a87ea5aaad6605a8a2a6 100644 (file)
--- a/etc/systemd/system/zfs-import-cache.service.in
+++ b/etc/systemd/system/zfs-import-cache.service.in
@@ -6,7 +6,6 @@ Requires=systemd-udev-settle.service
 After=systemd-udev-settle.service
 After=cryptsetup.target
 After=systemd-remount-fs.service
-Before=dracut-mount.service
 Before=zfs-import.target
 ConditionPathExists=@sysconfdir@/zfs/zpool.cache
 

diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
index d73b2b9dc1e3acbda38435f217c0aa6be4b74d53..213a3beaf910c867b72ca43313131e5f8d5ed356 100644 (file)
--- a/etc/systemd/system/zfs-import-scan.service.in
+++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -5,7 +5,6 @@ DefaultDependencies=no
 Requires=systemd-udev-settle.service
 After=systemd-udev-settle.service
 After=cryptsetup.target
-Before=dracut-mount.service
 Before=zfs-import.target
 ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
 

diff --git a/etc/systemd/system/zfs-import.target.in b/etc/systemd/system/zfs-import.target.in
index ef25679ab479a2a1061b02ba9b11c3f3987c8b48..8d78a7a960307debfff42b980e9f8bd64d81ce50 100644 (file)
--- a/etc/systemd/system/zfs-import.target.in
+++ b/etc/systemd/system/zfs-import.target.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=ZFS pool import target
+Before=dracut-mount.service
 
 [Install]
-WantedBy=zfs-mount.service
 WantedBy=zfs.target

diff --git a/etc/systemd/system/zfs-mount.service.in b/etc/systemd/system/zfs-mount.service.in
index 8a73716f512345d99cfc838a2b79ed03646a7955..a18691a4680ad4978d7ee4721403e20e3839adf0 100644 (file)
--- a/etc/systemd/system/zfs-mount.service.in
+++ b/etc/systemd/system/zfs-mount.service.in
@@ -13,5 +13,4 @@ RemainAfterExit=yes
 ExecStart=@sbindir@/zfs mount -a
 
 [Install]
-WantedBy=zfs-share.service
 WantedBy=zfs.target

diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in
index d0c93a3e6b29ae0c27ad8aa19a993ca46de8d2df..312547c262e1e3f19e18452177aa7eae68ee3b69 100644 (file)
--- a/etc/systemd/system/zfs-share.service.in
+++ b/etc/systemd/system/zfs-share.service.in
@@ -3,7 +3,7 @@ Description=ZFS file system shares
 Documentation=man:zfs(8)
 After=nfs-server.service nfs-kernel-server.service
 After=smb.service
-After=zfs-mount.service
+Wants=zfs-mount.service
 PartOf=nfs-server.service nfs-kernel-server.service
 PartOf=smb.service
 

diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
index e3dec3dca1b66da5e3f8a2e2eb9054532ed96377..31751500302def448a979a54c5c08c934043027b 100644 (file)
--- a/etc/systemd/system/zfs-zed.service.in
+++ b/etc/systemd/system/zfs-zed.service.in
@@ -1,8 +1,7 @@
 [Unit]
 Description=ZFS Event Daemon (zed)
 Documentation=man:zed(8)
-After=zfs-import-cache.service
-After=zfs-import-scan.service
+After=zfs-import.target
 
 [Service]
 ExecStart=@sbindir@/zed -F