From 881f45c6a8f44486f76c4713ecef0d533d6601e8 Mon Sep 17 00:00:00 2001 From: Ralf Ertzinger Date: Sun, 19 Jan 2014 15:36:49 +0100 Subject: Add systemd unit files for ZFS startup This adds systemd unit files replacing the functionality offered by the SysV init script found in etc/init.d. It has been developed and tested on Fedora 19, Fedora 20 and openSuSE 13.1. Four unit files and one target are offered. zfs-import-cache.service: Import pools from /etc/zfs/zpool.cache. This unit will wait for udev to settle. zfs-import-scan.service: Import pools by scanning /dev/disk/by-id for zvols. This unit will only run if /etc/zfs/zpool.cache is not present. This unit will wait for udev to settle zfs-mount.service: Mount ZFS native filesystems. It contains a dependency to be loaded before local-fs.target. zfs-share.service: Share NFS/SMB filesystems. This unit contains a dependency that will cause it to be restarted whenever the smb or nfs-server unit is restarted, restoring the shares added. zfs.target: This target pulls in the other units in order to start ZFS. It's the only unit that can be enabled/disabled, all other services are static and pulled in by dependencies. It will honour zfs=off and zfs=no options on the kernel command line. Signed-off-by: Brian Behlendorf Closes #2108 --- etc/Makefile.am | 3 ++- etc/modules-load.d/.gitignore | 1 + etc/modules-load.d/Makefile.am | 13 +++++++++++ etc/modules-load.d/zfs.conf.in | 1 + etc/systemd/Makefile.am | 1 + etc/systemd/system/.gitignore | 3 +++ etc/systemd/system/50-zfs.preset.in | 2 ++ etc/systemd/system/Makefile.am | 31 ++++++++++++++++++++++++++ etc/systemd/system/zfs-import-cache.service.in | 11 +++++++++ etc/systemd/system/zfs-import-scan.service.in | 11 +++++++++ etc/systemd/system/zfs-mount.service.in | 15 +++++++++++++ etc/systemd/system/zfs-share.service.in | 11 +++++++++ etc/systemd/system/zfs.target.in | 7 ++++++ 13 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 etc/modules-load.d/.gitignore create mode 100644 etc/modules-load.d/Makefile.am create mode 100644 etc/modules-load.d/zfs.conf.in create mode 100644 etc/systemd/Makefile.am create mode 100644 etc/systemd/system/.gitignore create mode 100644 etc/systemd/system/50-zfs.preset.in create mode 100644 etc/systemd/system/Makefile.am create mode 100644 etc/systemd/system/zfs-import-cache.service.in create mode 100644 etc/systemd/system/zfs-import-scan.service.in create mode 100644 etc/systemd/system/zfs-mount.service.in create mode 100644 etc/systemd/system/zfs-share.service.in create mode 100644 etc/systemd/system/zfs.target.in (limited to 'etc') diff --git a/etc/Makefile.am b/etc/Makefile.am index 65882b55e..a62678b4e 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1 +1,2 @@ -SUBDIRS = init.d zfs +SUBDIRS = zfs $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD) +DIST_SUBDIRS = init.d zfs systemd modules-load.d diff --git a/etc/modules-load.d/.gitignore b/etc/modules-load.d/.gitignore new file mode 100644 index 000000000..fee921708 --- /dev/null +++ b/etc/modules-load.d/.gitignore @@ -0,0 +1 @@ +*.conf diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am new file mode 100644 index 000000000..980cb8519 --- /dev/null +++ b/etc/modules-load.d/Makefile.am @@ -0,0 +1,13 @@ +modulesload_DATA = \ + $(top_srcdir)/etc/modules-load.d/zfs.conf + +EXTRA_DIST = \ + $(top_srcdir)/etc/modules-load.d/zfs.conf.in + +$(modulesload_DATA): + -$(SED) \ + -e '' \ + '$@.in' >'$@' + +distclean-local:: + -$(RM) $(modulesload_DATA) diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in new file mode 100644 index 000000000..73304bc2c --- /dev/null +++ b/etc/modules-load.d/zfs.conf.in @@ -0,0 +1 @@ +zfs diff --git a/etc/systemd/Makefile.am b/etc/systemd/Makefile.am new file mode 100644 index 000000000..d4008c0dd --- /dev/null +++ b/etc/systemd/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = system diff --git a/etc/systemd/system/.gitignore b/etc/systemd/system/.gitignore new file mode 100644 index 000000000..efada54ad --- /dev/null +++ b/etc/systemd/system/.gitignore @@ -0,0 +1,3 @@ +*.service +*.target +*.preset diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in new file mode 100644 index 000000000..4efdd7200 --- /dev/null +++ b/etc/systemd/system/50-zfs.preset.in @@ -0,0 +1,2 @@ +# ZFS is enabled by default +enable zfs.* diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am new file mode 100644 index 000000000..31521cecc --- /dev/null +++ b/etc/systemd/system/Makefile.am @@ -0,0 +1,31 @@ +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/zfs-import-cache.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/zfs-import-cache.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,@sbindir\@,$(sbindir),g' \ + -e 's,@sysconfdir\@,$(sysconfdir),g' \ + '$@.in' >'$@' + +$(systemdpreset_DATA): + -$(SED) -e 's,@bindir\@,$(bindir),g' \ + -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@sysconfdir\@,$(sysconfdir),g' \ + '$@.in' >'$@' + +distclean-local:: + -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA) diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in new file mode 100644 index 000000000..918a258a1 --- /dev/null +++ b/etc/systemd/system/zfs-import-cache.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Import ZFS pools by cache file +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +ConditionPathExists=@sysconfdir@/zfs/zpool.cache + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in new file mode 100644 index 000000000..ab1b0f693 --- /dev/null +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Import ZFS pools by device scanning +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +ConditionPathExists=!@sysconfdir@/zfs/zpool.cache + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@sbindir@/zpool import -d /dev/disk/by-id -aN diff --git a/etc/systemd/system/zfs-mount.service.in b/etc/systemd/system/zfs-mount.service.in new file mode 100644 index 000000000..f1056af31 --- /dev/null +++ b/etc/systemd/system/zfs-mount.service.in @@ -0,0 +1,15 @@ +[Unit] +Description=Mount ZFS filesystems +DefaultDependencies=no +Wants=zfs-import-cache.service +Wants=zfs-import-scan.service +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service +After=zfs-import-cache.service +After=zfs-import-scan.service +Before=local-fs.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@sbindir@/zfs mount -a diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in new file mode 100644 index 000000000..a21c9c663 --- /dev/null +++ b/etc/systemd/system/zfs-share.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=ZFS file system shares +After=nfs-server.service +After=smb.service +PartOf=nfs-server.service +PartOf=smb.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@sbindir@/zfs share -a diff --git a/etc/systemd/system/zfs.target.in b/etc/systemd/system/zfs.target.in new file mode 100644 index 000000000..7d464873b --- /dev/null +++ b/etc/systemd/system/zfs.target.in @@ -0,0 +1,7 @@ +[Unit] +Description=ZFS startup target +Requires=zfs-mount.service +Requires=zfs-share.service + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3