Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Antonio Russo 2017-11-08 12:39:15 -05:00 committed by Brian Behlendorf
parent 011ef12c7a
commit 80b485246a
7 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/systemd/system/50-zfs.preset.in
View File

@ -1,6 +1,7 @@
# ZFS is enabled by default # ZFS is enabled by default
enable zfs-import-cache.service enable zfs-import-cache.service
disable zfs-import-scan.service disable zfs-import-scan.service
enable zfs-import.target
enable zfs-mount.service enable zfs-mount.service
enable zfs-share.service enable zfs-share.service
enable zfs-zed.service enable zfs-zed.service

1
etc/systemd/system/zfs-import-cache.service.in
View File

@ -6,7 +6,6 @@ Requires=systemd-udev-settle.service
After=systemd-udev-settle.service After=systemd-udev-settle.service
After=cryptsetup.target After=cryptsetup.target
After=systemd-remount-fs.service After=systemd-remount-fs.service
Before=dracut-mount.service
Before=zfs-import.target Before=zfs-import.target
ConditionPathExists=@sysconfdir@/zfs/zpool.cache ConditionPathExists=@sysconfdir@/zfs/zpool.cache

1
etc/systemd/system/zfs-import-scan.service.in
View File

@ -5,7 +5,6 @@ DefaultDependencies=no
Requires=systemd-udev-settle.service Requires=systemd-udev-settle.service
After=systemd-udev-settle.service After=systemd-udev-settle.service
After=cryptsetup.target After=cryptsetup.target
Before=dracut-mount.service
Before=zfs-import.target Before=zfs-import.target
ConditionPathExists=!@sysconfdir@/zfs/zpool.cache ConditionPathExists=!@sysconfdir@/zfs/zpool.cache

2
etc/systemd/system/zfs-import.target.in
View File

@ -1,6 +1,6 @@
[Unit] [Unit]
Description=ZFS pool import target Description=ZFS pool import target
Before=dracut-mount.service
[Install] [Install]
WantedBy=zfs-mount.service
WantedBy=zfs.target WantedBy=zfs.target

1
etc/systemd/system/zfs-mount.service.in
View File

@ -13,5 +13,4 @@ RemainAfterExit=yes
ExecStart=@sbindir@/zfs mount -a ExecStart=@sbindir@/zfs mount -a
[Install] [Install]
WantedBy=zfs-share.service
WantedBy=zfs.target WantedBy=zfs.target

2
etc/systemd/system/zfs-share.service.in
View File

@ -3,7 +3,7 @@ Description=ZFS file system shares
Documentation=man:zfs(8) Documentation=man:zfs(8)
After=nfs-server.service nfs-kernel-server.service After=nfs-server.service nfs-kernel-server.service
After=smb.service After=smb.service
After=zfs-mount.service Wants=zfs-mount.service
PartOf=nfs-server.service nfs-kernel-server.service PartOf=nfs-server.service nfs-kernel-server.service
PartOf=smb.service PartOf=smb.service

3
etc/systemd/system/zfs-zed.service.in
View File

@ -1,8 +1,7 @@
[Unit] [Unit]
Description=ZFS Event Daemon (zed) Description=ZFS Event Daemon (zed)
Documentation=man:zed(8) Documentation=man:zed(8)
After=zfs-import-cache.service After=zfs-import.target
After=zfs-import-scan.service
[Service] [Service]
ExecStart=@sbindir@/zed -F ExecStart=@sbindir@/zed -F