summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2013-07-09 08:30:31 +0000
committeravg <avg@FreeBSD.org>2013-07-09 08:30:31 +0000
commite4102365090de1a8851f9106b7ca2536d4cda266 (patch)
treef7f663cb1aa1c077bf339031116c746f7c6759d3 /tools
parent1df29cf582471cb617ef2b53eb8d17174f0ba9d9 (diff)
downloadFreeBSD-src-e4102365090de1a8851f9106b7ca2536d4cda266.zip
FreeBSD-src-e4102365090de1a8851f9106b7ca2536d4cda266.tar.gz
zfsboottest.sh: remove checks for things that are not strictly required
MFC after: 10 days
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tools/zfsboottest/zfsboottest.sh18
1 files changed, 0 insertions, 18 deletions
diff --git a/tools/tools/zfsboottest/zfsboottest.sh b/tools/tools/zfsboottest/zfsboottest.sh
index 1707e3f..1aea755 100755
--- a/tools/tools/zfsboottest/zfsboottest.sh
+++ b/tools/tools/zfsboottest/zfsboottest.sh
@@ -54,11 +54,6 @@ bootfs=`zpool get bootfs "${pool}" | tail -1 | awk '{print $3}'`
if [ "${bootfs}" = "-" ]; then
bootfs="${pool}"
fi
-# Dataset's mountpoint property should be set to 'legacy'.
-if [ "`zfs get -H -o value mountpoint ${bootfs}`" != "legacy" ]; then
- echo "The \"mountpoint\" property of dataset \"${bootfs}\" should be set to \"legacy\"." >&2
- exit 1
-fi
mountpoint=`df -t zfs "${bootfs}" 2>/dev/null | tail -1 | awk '{print $6}'`
if [ -z "${mountpoint}" ]; then
echo "The \"${bootfs}\" dataset is not mounted." >&2
@@ -68,19 +63,6 @@ if [ ! -d "${mountpoint}${startdir}" ]; then
echo "The \"${mountpoint}${startdir}\" directory doesn't exist." >&2
exit 1
fi
-# To be able to mount root ZFS file system we need either /etc/fstab entry
-# 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="?'"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 \"zfs:${bootfs}\" to" >&2
- echo "${mountpoint}/boot/loader.conf." >&2
- exit 1
- fi
-fi
vdevs=""
for vdev in `zpool status "${pool}" | grep ONLINE | awk '{print $1}'`; do
vdev="/dev/${vdev#/dev/}"
OpenPOWER on IntegriCloud