Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Richard Yao 2015-08-29 18:45:56 -04:00 committed by Brian Behlendorf
parent 36b454ab4c
commit da619f3a19
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/init.d/zfs-mount.in
View File

@ -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

11
etc/init.d/zfs-zed.in
View File

@ -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
}