From owner-svn-src-all@FreeBSD.ORG  Tue Nov 18 13:38:10 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 33A5FAD5;
 Tue, 18 Nov 2014 13:38:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D4756D6;
 Tue, 18 Nov 2014 13:38:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAIDc9ix051870;
 Tue, 18 Nov 2014 13:38:09 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAIDc9U3051869;
 Tue, 18 Nov 2014 13:38:09 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201411181338.sAIDc9U3051869@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org
 using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 18 Nov 2014 13:38:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274653 - head/usr.sbin/freebsd-update
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Nov 2014 13:38:10 -0000

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