c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 11:29:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix boot from ZFS issues

Browse Source 
* 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:
aun 2017-10-11 20:06:20 +03:00 committed by Tony Hutter
parent 8d688ce66a
commit c3ac4ccabb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/initramfs/scripts/local-top/zfs
View File

@ -44,7 +44,7 @@ activate_vg()
{ {
# Sanity checks # Sanity checks
if [ ! -x /sbin/lvm ]; then if [ ! -x /sbin/lvm ]; then
message "lvm is not available" [ "$quiet" != "y" ] && message "lvm is not available"
return 1 return 1
fi fi

4
contrib/initramfs/scripts/zfs
View File

@ -579,10 +579,10 @@ ask_user_snap()
eval `echo SNAP_$i=$snap` eval `echo SNAP_$i=$snap`
i=$((i + 1)) i=$((i + 1))
done <<EOT done <<EOT
$("${ZFS}" list -H -oname -tsnapshot "${fs}") $("${ZFS}" list -H -oname -tsnapshot -r "${fs}")
EOT EOT
echo -n " Snap nr [0-$((i-1))]? " > /dev/stderr echo -n " Snap nr [1-$((i-1))]? " > /dev/stderr
read snapnr read snapnr
# Re-enable debugging. # Re-enable debugging.