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 openzfs#3837
tuxoko · Sep 7, 2016 · 9e9bd38 · 9e9bd38
1 parent c24dd95
commit 9e9bd38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
@@ -2,15 +2,15 @@ systemdpreset_DATA = \
 	50-zfs.preset
 
 systemdunit_DATA = \
-	zed.service \
+	zfs-zed.service \
 	zfs-import-cache.service \
 	zfs-import-scan.service \
 	zfs-mount.service \
 	zfs-share.service \
 	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 → etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zed.service.in → 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
@@ -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