Fix boot from ZFS issues
* Correct ZFS snapshot listing * Disable "lvm is not available" message on quiet boot Reviewed-by: George Melikov <mail@gmelikov.ru> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Alar Aun <spamtoaun@gmail.com> Closes #6700 Closes #6747
This commit is contained in:
parent
29e07af5ae
commit
d4404c3fdb
|
@ -44,7 +44,7 @@ activate_vg()
|
|||
{
|
||||
# Sanity checks
|
||||
if [ ! -x /sbin/lvm ]; then
|
||||
message "lvm is not available"
|
||||
[ "$quiet" != "y" ] && message "lvm is not available"
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
|
|
@ -579,10 +579,10 @@ ask_user_snap()
|
|||
eval `echo SNAP_$i=$snap`
|
||||
i=$((i + 1))
|
||||
done <<EOT
|
||||
$("${ZFS}" list -H -oname -tsnapshot "${fs}")
|
||||
$("${ZFS}" list -H -oname -tsnapshot -r "${fs}")
|
||||
EOT
|
||||
|
||||
echo -n " Snap nr [0-$((i-1))]? " > /dev/stderr
|
||||
echo -n " Snap nr [1-$((i-1))]? " > /dev/stderr
|
||||
read snapnr
|
||||
|
||||
# Re-enable debugging.
|
||||
|
|
Loading…
Reference in New Issue