diff options
| author | avg <avg@FreeBSD.org> | 2012-05-07 15:06:07 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2012-05-07 15:06:07 +0000 |
| commit | 4b75b9fd05d0679d47f6e0a2d49cd45c2806b013 (patch) | |
| tree | 1a02cc29224c01c73c284b1863a2fcfb2a54b05a /tools | |
| parent | 21b948097d64c714a445a157b1f035a2c7616a0c (diff) | |
| download | FreeBSD-src-4b75b9fd05d0679d47f6e0a2d49cd45c2806b013.zip FreeBSD-src-4b75b9fd05d0679d47f6e0a2d49cd45c2806b013.tar.gz | |
zfsboottest.sh: correctly check and suggest value of vfs.root.mountfrom
... it was missing "zfs:" prefix.
Reported by: theraven
MFC after: 10 days
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/tools/zfsboottest/zfsboottest.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/tools/zfsboottest/zfsboottest.sh b/tools/tools/zfsboottest/zfsboottest.sh index 461d966..1707e3f 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 |
