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 <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3715

diff --git a/etc/init.d/zfs-mount.in b/etc/init.d/zfs-mount.in
index 3be3d7b1369f9c1418efb50f476f8076ed790454..cf79b852b2a598094236297e48e4dbdca5817d70 100755 (executable)
--- 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 9fa243f8f29c19315d6e5f175eda4ede31b9ec38..fa70a82c2fb121f305cdaf64bb6a7f86fa9d2f9a 100755 (executable)
--- 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
 }