Add systemd unit file for zed

This commit adds a systemd unit file for zed.service and integrates it into the zfs.target from commit 881f45c. Signed-off-by: Chris Dunlap <cdunlap@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #2108 Issue #2
openzfsonosx · Apr 2, 2014 · 11a7043 · 11a7043
1 parent 9e246ac
commit 11a7043
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
@@ -1,28 +1,32 @@
 systemdpreset_DATA = \
 	$(top_srcdir)/etc/systemd/system/50-zfs.preset
 systemdunit_DATA = \
-	$(top_srcdir)/etc/systemd/system/zfs-import-scan.service \
+	$(top_srcdir)/etc/systemd/system/zed.service \
 	$(top_srcdir)/etc/systemd/system/zfs-import-cache.service \
+	$(top_srcdir)/etc/systemd/system/zfs-import-scan.service \
 	$(top_srcdir)/etc/systemd/system/zfs-mount.service \
 	$(top_srcdir)/etc/systemd/system/zfs-share.service \
 	$(top_srcdir)/etc/systemd/system/zfs.target
 
 EXTRA_DIST = \
-	$(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \
+	$(top_srcdir)/etc/systemd/system/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 \
 	$(top_srcdir)/etc/systemd/system/zfs-share.service.in \
 	$(top_srcdir)/etc/systemd/system/zfs.target.in \
 	$(top_srcdir)/etc/systemd/system/50-zfs.preset.in
 
 $(systemdunit_DATA):
 	-$(SED) -e 's,@bindir\@,$(bindir),g' \
+		-e 's,@runstatedir\@,$(runstatedir),g' \
 		-e 's,@sbindir\@,$(sbindir),g' \
 		-e 's,@sysconfdir\@,$(sysconfdir),g' \
 		'$@.in' >'$@'
 
 $(systemdpreset_DATA):
 	-$(SED) -e 's,@bindir\@,$(bindir),g' \
+		-e 's,@runstatedir\@,$(runstatedir),g' \
 		-e 's,@sbindir\@,$(sbindir),g' \
 		-e 's,@sysconfdir\@,$(sysconfdir),g' \
 		'$@.in' >'$@'

diff --git a/etc/systemd/system/zed.service.in b/etc/systemd/system/zed.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=ZFS Event Daemon (zed)
+Documentation=man:zed(8)
+After=zfs-import-cache.service
+After=zfs-import-scan.service
+
+[Service]
+Type=forking
+ExecStart=@sbindir@/zed
+PIDFile=@runstatedir@/zed.pid
+User=root
+Group=root
+Restart=on-abort
diff --git a/etc/systemd/system/zfs.target.in b/etc/systemd/system/zfs.target.in
@@ -2,6 +2,7 @@
 Description=ZFS startup target
 Requires=zfs-mount.service
 Requires=zfs-share.service
+Wants=zed.service
 
 [Install]
 WantedBy=multi-user.target