From owner-svn-src-head@FreeBSD.ORG  Mon Nov 17 15:12:47 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE9C84B5;
 Mon, 17 Nov 2014 15:12:47 +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 BAFF1217;
 Mon, 17 Nov 2014 15:12:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHFClFb011003;
 Mon, 17 Nov 2014 15:12:47 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHFClg9011002;
 Mon, 17 Nov 2014 15:12:47 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201411171512.sAHFClg9011002@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: Mon, 17 Nov 2014 15:12:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274630 - 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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Nov 2014 15:12:47 -0000

Author: feld (ports committer)
Date: Mon Nov 17 15:12:46 2014
New Revision: 274630
URL: https://svnweb.freebsd.org/changeset/base/274630

Log:
  Add logic for detecting non-persistent filesystems being utilized by
  workdir which would break the upgrade process upon reboot.
  
  Currently we check for tmpfs and mdmfs.
  
  PR:		195006
  Differential Revision:	https://reviews.freebsd.org/D1163
  Approved by:	cperciva

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	Mon Nov 17 14:56:02 2014	(r274629)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh	Mon Nov 17 15:12:46 2014	(r274630)
@@ -580,6 +580,7 @@ fetchupgrade_check_params () {
 	_KEYPRINT_z="Key must be given via -k option or configuration file."
 	_KEYPRINT_bad="Invalid key fingerprint: "
 	_WORKDIR_bad="Directory does not exist or is not writable: "
+	_WORKDIR_bad2="Directory is not on a persistent filesystem: "
 
 	if [ -z "${SERVERNAME}" ]; then
 		echo -n "`basename $0`: "
@@ -603,6 +604,14 @@ 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
 	chmod 700 ${WORKDIR}
 	cd ${WORKDIR} || exit 1