Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Boot from ZFS #6747

Merged
merged 1 commit into from Oct 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/initramfs/scripts/local-top/zfs
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
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