From da619f3a199d938168079e153360b280dc45268a Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Sat, 29 Aug 2015 18:45:56 -0400 Subject: [PATCH] Some OpenRC dependency logic belongs in mount The dependencies for handling / on ZFS belong in the mount script, not the zed script. Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Closes #3715 --- etc/init.d/zfs-mount.in | 11 +++++++++++ etc/init.d/zfs-zed.in | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/etc/init.d/zfs-mount.in b/etc/init.d/zfs-mount.in index 3be3d7b136..cf79b852b2 100755 --- a/etc/init.d/zfs-mount.in +++ b/etc/init.d/zfs-mount.in @@ -46,6 +46,17 @@ chkroot() { do_depend() { + # Try to allow people to mix and match fstab with ZFS in a way that makes sense. + if [ "$(mountinfo -s /)" = 'zfs' ] + then + before localmount + else + after localmount + fi + + # bootmisc will log to /var which may be a different zfs than root. + before bootmisc logger + after procfs zfs-import sysfs procps use mtab keyword -lxc -openvz -prefix -vserver diff --git a/etc/init.d/zfs-zed.in b/etc/init.d/zfs-zed.in index 9fa243f8f2..fa70a82c2f 100755 --- a/etc/init.d/zfs-zed.in +++ b/etc/init.d/zfs-zed.in @@ -45,16 +45,7 @@ ZED_PIDFILE="@runstatedir@/$ZED_NAME.pid" do_depend() { - # Try to allow people to mix and match fstab with ZFS in a way that makes sense. - if [ "$(mountinfo -s /)" = 'zfs' ] - then - before localmount - else - after localmount - fi - - # bootmisc will log to /var which may be a different zfs than root. - before bootmisc logger zfs-import + before zfs-import after sysfs }