summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorTurbo Fredriksson <[email protected]>2015-09-23 23:04:17 +0200
committerNed Bass <[email protected]>2016-09-05 16:07:09 -0700
commit1db6030de263e49cf0c701436ad8a5f2944b510c (patch)
treed7bd4cb1809b1375cf3abfd255f8de80c62d358c /etc
parentf3f0c589c32a0f3321d37cbf046e0a32881bff4b (diff)
Rename 'zed.service' to 'zfs-zed.service'
For consistency all systemd unit files and init scripts now share the same names. This prevents an issue where the zed is started twice on systems where both the systemd and sysv infrastructure is installed concurrently. For backward compatibility a 'zed' alias has been added. This allows the user to interact with the service using either the name 'zed' or 'zfs-zed'. Signed-off-by: Turbo Fredriksson <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #3837
Diffstat (limited to 'etc')
-rw-r--r--etc/systemd/system/Makefile.am4
-rw-r--r--etc/systemd/system/zfs-zed.service.in (renamed from etc/systemd/system/zed.service.in)3
-rw-r--r--etc/systemd/system/zfs.target.in2
3 files changed, 6 insertions, 3 deletions
diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
index 82aedd1ea..f7023dff0 100644
--- a/etc/systemd/system/Makefile.am
+++ b/etc/systemd/system/Makefile.am
@@ -2,7 +2,7 @@ systemdpreset_DATA = \
50-zfs.preset
systemdunit_DATA = \
- zed.service \
+ zfs-zed.service \
zfs-import-cache.service \
zfs-import-scan.service \
zfs-mount.service \
@@ -10,7 +10,7 @@ systemdunit_DATA = \
zfs.target
EXTRA_DIST = \
- $(top_srcdir)/etc/systemd/system/zed.service.in \
+ $(top_srcdir)/etc/systemd/system/zfs-zed.service.in \
$(top_srcdir)/etc/systemd/system/zfs-import-cache.service.in \
$(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \
$(top_srcdir)/etc/systemd/system/zfs-mount.service.in \
diff --git a/etc/systemd/system/zed.service.in b/etc/systemd/system/zfs-zed.service.in
index 5b2363092..4d4c9d841 100644
--- a/etc/systemd/system/zed.service.in
+++ b/etc/systemd/system/zfs-zed.service.in
@@ -7,3 +7,6 @@ After=zfs-import-scan.service
[Service]
ExecStart=@sbindir@/zed -F
Restart=on-abort
+
+[Install]
+Alias=zed.service
diff --git a/etc/systemd/system/zfs.target.in b/etc/systemd/system/zfs.target.in
index 354153385..ce110e573 100644
--- a/etc/systemd/system/zfs.target.in
+++ b/etc/systemd/system/zfs.target.in
@@ -2,7 +2,7 @@
Description=ZFS startup target
Requires=zfs-mount.service
Requires=zfs-share.service
-Wants=zed.service
+Wants=zfs-zed.service
[Install]
WantedBy=multi-user.target