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 <turbo@bayour.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #3837

diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
index 82aedd1ea08068c5969c05419f53668ea5c86d42..f7023dff07097a026164d7e3fd8cf47df90bb08a 100644 (file)
--- 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
similarity index 86%
rename from etc/systemd/system/zed.service.in
rename to etc/systemd/system/zfs-zed.service.in
index 5b23630923e14d06c03e25a47f0515db01e81aeb..4d4c9d8413236ab78bdb92ed7489ed33db04badf 100644 (file)
--- 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 35415338560a87122f5a2facc161b386c63e0bf3..ce110e573bacee55a9ca1d4e666d9ecdc8200d37 100644 (file)
--- 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