Date: Tue, 9 Jul 2013 08:30:31 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253068 - head/tools/tools/zfsboottest Message-ID: <201307090830.r698UVsG013111@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Tue Jul 9 08:30:31 2013 New Revision: 253068 URL: http://svnweb.freebsd.org/changeset/base/253068 Log: zfsboottest.sh: remove checks for things that are not strictly required MFC after: 10 days Modified: head/tools/tools/zfsboottest/zfsboottest.sh Modified: head/tools/tools/zfsboottest/zfsboottest.sh ============================================================================== --- head/tools/tools/zfsboottest/zfsboottest.sh Tue Jul 9 08:29:14 2013 (r253067) +++ head/tools/tools/zfsboottest/zfsboottest.sh Tue Jul 9 08:30:31 2013 (r253068) @@ -54,11 +54,6 @@ bootfs=`zpool get bootfs "${pool}" | tai 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}" ]; 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/}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307090830.r698UVsG013111>