Boot from ZFS

* Correct ZFS snapshot listing * Disable "lvm is not available" message on quiet boot
openzfs · Oct 10, 2017 · 69eb9d2 · 69eb9d2
1 parent 4f23c5d
commit 69eb9d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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.