diff options
| -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. |