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
This commit is contained in:
Turbo Fredriksson 2015-09-23 23:04:17 +02:00 committed by Ned Bass
parent f3f0c589c3
commit 1db6030de2
3 changed files with 6 additions and 3 deletions

View File

@ -2,7 +2,7 @@ systemdpreset_DATA = \
50-zfs.preset 50-zfs.preset
systemdunit_DATA = \ systemdunit_DATA = \
zed.service \ zfs-zed.service \
zfs-import-cache.service \ zfs-import-cache.service \
zfs-import-scan.service \ zfs-import-scan.service \
zfs-mount.service \ zfs-mount.service \
@ -10,7 +10,7 @@ systemdunit_DATA = \
zfs.target zfs.target
EXTRA_DIST = \ 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-cache.service.in \
$(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \ $(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \
$(top_srcdir)/etc/systemd/system/zfs-mount.service.in \ $(top_srcdir)/etc/systemd/system/zfs-mount.service.in \

View File

@ -7,3 +7,6 @@ After=zfs-import-scan.service
[Service] [Service]
ExecStart=@sbindir@/zed -F ExecStart=@sbindir@/zed -F
Restart=on-abort Restart=on-abort
[Install]
Alias=zed.service

View File

@ -2,7 +2,7 @@
Description=ZFS startup target Description=ZFS startup target
Requires=zfs-mount.service Requires=zfs-mount.service
Requires=zfs-share.service Requires=zfs-share.service
Wants=zed.service Wants=zfs-zed.service
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target