Skip to content

Commit

Permalink
Fix boot from ZFS issues
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
aun authored and behlendorf committed Oct 11, 2017
1 parent 29e07af commit d4404c3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion contrib/initramfs/scripts/local-top/zfs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions contrib/initramfs/scripts/zfs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit d4404c3

Please sign in to comment.