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

zfs dracut module should not assume systemd presence 

Signed-off-by: Moritz Maxeiner <moritz@ucworks.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4749
Closes #5058
This commit is contained in:
Moritz Maxeiner 2016-09-01 18:29:31 +02:00 committed by Brian Behlendorf
parent 61c7349439
commit 8516203d53
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/dracut/90zfs/mount-zfs.sh.in
View File

@ -10,14 +10,16 @@ case "${root}" in
*) return ;;
esac
# If sysroot.mount exists, the initial RAM disk configured
# it to mount ZFS on root. In that case, we bail early.
loadstate="$(systemctl --system --show -p LoadState sysroot.mount || true)"
if [ "${loadstate}" = "LoadState=not-found" -o "${loadstate}" = "" ] ; then
info "ZFS: sysroot.mount absent, mounting root with mount-zfs.sh"
else
info "ZFS: sysroot.mount present, delegating root mount to it"
return
if command -v systemctl >/dev/null; then
# If sysroot.mount exists, the initial RAM disk configured
# it to mount ZFS on root. In that case, we bail early.
loadstate="$(systemctl --system --show -p LoadState sysroot.mount || true)"
if [ "${loadstate}" = "LoadState=not-found" -o "${loadstate}" = "" ] ; then
info "ZFS: sysroot.mount absent, mounting root with mount-zfs.sh"
else
info "ZFS: sysroot.mount present, delegating root mount to it"
return
fi
fi
# Delay until all required block devices are present.