c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-26 18:04:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure FC15 boots when zfs isn't used for boot partition

Browse Source 
It seems that dracut version 009 through 013 won't boot correctly when
the zfs-dracut rpm package has been installed, but 'root=zfs' isn't
used on the boot commandline, for example when the package has been
installed on a system that _doesn't_ boot from a zfs filesystem.

Signed-off-by: Jeremy Gill <jgill@parallax-innovations.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #377
This commit is contained in:
Jeremy Gill 2011-08-26 13:55:26 -04:00 committed by Brian Behlendorf
parent 7cdac8b853
commit 185853d9f2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dracut/90zfs/parse-zfs.sh.in
View File

@ -17,18 +17,19 @@ fi
case "$root" in case "$root" in
""|zfs|zfs:) ""|zfs|zfs:)
# We'll take root unset, root=zfs, or root=zfs: # We'll take root unset, root=zfs, or root=zfs:
# No root set, so we want to read the bootfs attribute. We can't do # No root set, so we want to read the bootfs attribute. We
# that until udev settles so we'll set dummy values and hope for the # can't do that until udev settles so we'll set dummy values
# best later on. # and hope for the best later on.
root="zfs:AUTO" root="zfs:AUTO"
rootok=1 rootok=1
wait_for_zfs=1
info "ZFS: Enabling autodetection of bootfs after udev settles." info "ZFS: Enabling autodetection of bootfs after udev settles."
;; ;;
ZFS\=*|zfs:*|zfs:FILESYSTEM\=*|FILESYSTEM\=*) ZFS\=*|zfs:*|zfs:FILESYSTEM\=*|FILESYSTEM\=*)
# root is explicit ZFS root. Parse it now. # root is explicit ZFS root. Parse it now. We can handle
# We can handle a root=... param in any of the following formats: # a root=... param in any of the following formats:
# root=ZFS=rpool/ROOT # root=ZFS=rpool/ROOT
# root=zfs:rpool/ROOT # root=zfs:rpool/ROOT
# root=zfs:FILESYSTEM=rpool/ROOT # root=zfs:FILESYSTEM=rpool/ROOT
@ -39,6 +40,7 @@ case "$root" in
root="${root#FILESYSTEM=}" root="${root#FILESYSTEM=}"
root="zfs:${root#ZFS=}" root="zfs:${root#ZFS=}"
rootok=1 rootok=1
wait_for_zfs=1
info "ZFS: Set ${root} as bootfs." info "ZFS: Set ${root} as bootfs."
;; ;;
@ -46,5 +48,7 @@ esac
# Make sure Dracut is happy that we have a root and will wait for ZFS # Make sure Dracut is happy that we have a root and will wait for ZFS
# modules to settle before mounting. # modules to settle before mounting.
ln -s /dev/null /dev/root 2>/dev/null if [ "${wait_for_zfs}" == "1" ]; then
echo '[ -e /dev/zfs ]' > $hookdir/initqueue/finished/zfs.sh ln -s /dev/null /dev/root 2>/dev/null
echo '[ -e /dev/zfs ]' > $hookdir/initqueue/finished/zfs.sh
fi