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:
parent
36b454ab4c
commit
da619f3a19
|
@ -46,6 +46,17 @@ chkroot() {
|
||||||
|
|
||||||
do_depend()
|
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
|
after procfs zfs-import sysfs procps
|
||||||
use mtab
|
use mtab
|
||||||
keyword -lxc -openvz -prefix -vserver
|
keyword -lxc -openvz -prefix -vserver
|
||||||
|
|
|
@ -45,16 +45,7 @@ ZED_PIDFILE="@runstatedir@/$ZED_NAME.pid"
|
||||||
|
|
||||||
do_depend()
|
do_depend()
|
||||||
{
|
{
|
||||||
# Try to allow people to mix and match fstab with ZFS in a way that makes sense.
|
before zfs-import
|
||||||
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
|
|
||||||
after sysfs
|
after sysfs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue