diff options
| -rwxr-xr-x | etc/init.d/zfs-mount.in | 11 | ||||
| -rwxr-xr-x | 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 3be3d7b13..cf79b852b 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 9fa243f8f..fa70a82c2 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 } |