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

diff --git a/contrib/initramfs/scripts/local-top/zfs b/contrib/initramfs/scripts/local-top/zfs
index f09b2c81ba29d4cba5b83d87da1008261b6b1e89..e8e5cd26451cbc0a6995c275c7c3bf0476ec1478 100755 (executable)
--- 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 68373d2f290e144ce94af39391687b45cd41655d..4650c964655b9a6e9beff50bf25a4fd0b7ea8cd6 100644 (file)
--- 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.