Date: Tue, 18 Nov 2014 13:38:09 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274653 - head/usr.sbin/freebsd-update Message-ID: <201411181338.sAIDc9U3051869@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld (ports committer) Date: Tue Nov 18 13:38:09 2014 New Revision: 274653 URL: https://svnweb.freebsd.org/changeset/base/274653 Log: Re-work non-persistent filesystem detection as it was not possible to detect /dev/md backed mfs filesystems that way. Differential Revision: https://reviews.freebsd.org/D1163 Approved by: ian Modified: head/usr.sbin/freebsd-update/freebsd-update.sh Modified: head/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- head/usr.sbin/freebsd-update/freebsd-update.sh Tue Nov 18 13:38:07 2014 (r274652) +++ head/usr.sbin/freebsd-update/freebsd-update.sh Tue Nov 18 13:38:09 2014 (r274653) @@ -604,14 +604,13 @@ fetchupgrade_check_params () { echo ${WORKDIR} exit 1 fi - for i in tmpfs mdmfs; do - if df -t ${i} ${WORKDIR} >/dev/null 2>1; then - echo -n "`basename $0`: " - echo -n "${_WORKDIR_bad2}" - echo ${WORKDIR} - exit 1 - fi - done + case `df -T ${WORKDIR}` in */dev/md[0-9]* | *tmpfs*) + echo -n "`basename $0`: " + echo -n "${_WORKDIR_bad2}" + echo ${WORKDIR} + exit 1 + ;; + esac chmod 700 ${WORKDIR} cd ${WORKDIR} || exit 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411181338.sAIDc9U3051869>