From 05795a78d2bb09da0f30a4a1929722f98b5dcd15 Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Mon, 7 May 2012 15:06:07 +0000 Subject: [PATCH] zfsboottest.sh: correctly check and suggest value of vfs.root.mountfrom ... it was missing "zfs:" prefix. Reported by: theraven MFC after: 10 days --- tools/tools/zfsboottest/zfsboottest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/zfsboottest/zfsboottest.sh b/tools/tools/zfsboottest/zfsboottest.sh index 461d9661360..1707e3f3e63 100755 --- a/tools/tools/zfsboottest/zfsboottest.sh +++ b/tools/tools/zfsboottest/zfsboottest.sh @@ -72,11 +72,11 @@ fi # or vfs.root.mountfrom variable set in /boot/loader.conf. egrep -q '^'"${bootfs}"'[[:space:]]+/[[:space:]]+zfs[[:space:]]+' "${mountpoint}/etc/fstab" 2>/dev/null if [ $? -ne 0 ]; then - egrep -q 'vfs.root.mountfrom="?'"${bootfs}"'"?[[:space:]]*$' "${mountpoint}/boot/loader.conf" 2>/dev/null + egrep -q 'vfs.root.mountfrom="?'"zfs:${bootfs}"'"?[[:space:]]*$' "${mountpoint}/boot/loader.conf" 2>/dev/null if [ $? -ne 0 ]; then echo "To be able to boot from \"${bootfs}\", you need to declare" >&2 echo "\"${bootfs}\" as being root file system in ${mountpoint}/etc/fstab" >&2 - echo "or add \"vfs.root.mountfrom\" variable set to \"${bootfs}\" to" >&2 + echo "or add \"vfs.root.mountfrom\" variable set to \"zfs:${bootfs}\" to" >&2 echo "${mountpoint}/boot/loader.conf." >&2 exit 1 fi