From 3f1cc17c9005d19faba91fe7236332ed502b1a3f Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 30 Aug 2015 14:36:41 -0400 Subject: Reorder zfs-* services to allow /var on separate dataset ZED depends on /var. When /var is a separate dataset, it must be mounted before starting ZED. This change moves the zfs-zed service from starting first, to starting after zfs-mount, but before zfs-share. As discussed in issue #3513, ZED does not need to start first in order to consume events made during the zfs-import and zfs-mount services. The events will be queued and can be handled later in the boot process. ZED may, however, handle sharing in the future, so it should be started before the zfs-share service. This commit also stops the zfs-import service from writing temp files to /var/tmp on shutdown and it corrects the return code for the OpenRC service. Other OpenRC-specific changes noted in issue #3513 were reitereated in issue #3715 and committed in da619f3. Signed-off-by: James Lee Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Closes #3513 --- etc/init.d/zfs-mount.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc/init.d/zfs-mount.in') diff --git a/etc/init.d/zfs-mount.in b/etc/init.d/zfs-mount.in index cf79b852b..95aefd6d6 100755 --- a/etc/init.d/zfs-mount.in +++ b/etc/init.d/zfs-mount.in @@ -16,7 +16,7 @@ # Required-Stop: $local_fs zfs-import # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# X-Stop-After: zfs-share +# X-Stop-After: zfs-zed # Short-Description: Mount ZFS filesystems and volumes # Description: Run the `zfs mount -a` or `zfs umount -a` commands. ### END INIT INFO @@ -57,7 +57,7 @@ do_depend() # bootmisc will log to /var which may be a different zfs than root. before bootmisc logger - after procfs zfs-import sysfs procps + after zfs-import sysfs use mtab keyword -lxc -openvz -prefix -vserver } -- cgit v1.2.3