diff options
| author | aun <[email protected]> | 2017-10-11 20:06:20 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-10-11 10:06:20 -0700 |
| commit | d4404c3fdbe11f5220fd6ab429bb2f12ac93d1f4 (patch) | |
| tree | a3092eb07dd28c0731329cba8498dfc520c30014 /contrib | |
| parent | 29e07af5ae77e0ddf9ccfb77684f9713627b2ceb (diff) | |
Fix boot from ZFS issues
* Correct ZFS snapshot listing
* Disable "lvm is not available" message on quiet boot
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Alar Aun <[email protected]>
Closes #6700
Closes #6747
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/initramfs/scripts/local-top/zfs | 2 | ||||
| -rw-r--r-- | contrib/initramfs/scripts/zfs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/initramfs/scripts/local-top/zfs b/contrib/initramfs/scripts/local-top/zfs index f09b2c81b..e8e5cd264 100755 --- a/contrib/initramfs/scripts/local-top/zfs +++ b/contrib/initramfs/scripts/local-top/zfs @@ -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 diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs index 68373d2f2..4650c9646 100644 --- a/contrib/initramfs/scripts/zfs +++ b/contrib/initramfs/scripts/zfs @@ -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. |