diff options
| author | Richard Yao <[email protected]> | 2015-08-29 18:45:56 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-08-30 10:06:59 -0700 |
| commit | da619f3a199d938168079e153360b280dc45268a (patch) | |
| tree | 6f4fd65fa34f566de7bd7c10e183266f498cf165 /etc/init.d/zfs-mount.in | |
| parent | 36b454ab4c33fef59c9cb25ff09c2454dcd4aa04 (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3715
Diffstat (limited to 'etc/init.d/zfs-mount.in')
| -rwxr-xr-x | etc/init.d/zfs-mount.in | 11 |
1 files changed, 11 insertions, 0 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 |