From d4404c3fdbe11f5220fd6ab429bb2f12ac93d1f4 Mon Sep 17 00:00:00 2001
From: aun <spamtoaun@gmail.com>
Date: Wed, 11 Oct 2017 20:06:20 +0300
Subject: [PATCH] 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
---
 contrib/initramfs/scripts/local-top/zfs | 2 +-
 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 f09b2c81ba29..e8e5cd26451c 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 68373d2f290e..4650c964655b 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.