From owner-svn-src-all@freebsd.org  Thu Jul  2 02:33:59 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38138992F13;
 Thu,  2 Jul 2015 02:33:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 20158156A;
 Thu,  2 Jul 2015 02:33:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t622XwMU023192;
 Thu, 2 Jul 2015 02:33:58 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t622XwEj023191;
 Thu, 2 Jul 2015 02:33:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201507020233.t622XwEj023191@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 2 Jul 2015 02:33:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285019 - head/release/tools
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.20
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: Thu, 02 Jul 2015 02:33:59 -0000

Author: gjb
Date: Thu Jul  2 02:33:58 2015
New Revision: 285019
URL: https://svnweb.freebsd.org/changeset/base/285019

Log:
  Fix the path to the UFS/MSDOSFS filesystem labels, since they
  cannot possibly exist within the chroot(8) before the target
  filesystem actually exists.
  
  MFC after:	3 days
  X-MFC-With:	r285018
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/arm.subr

Modified: head/release/tools/arm.subr
==============================================================================
--- head/release/tools/arm.subr	Thu Jul  2 02:13:20 2015	(r285018)
+++ head/release/tools/arm.subr	Thu Jul  2 02:33:58 2015	(r285019)
@@ -70,8 +70,8 @@ arm_create_disk() {
 	#      Trust me.  I'm an engineer.
 	if [ ! -z "${EVERYTHINGISFINE}" ]; then
 		for _label in ufs/rootfs msdosfs/MSDOSBOOT; do
-			if [ -e "${CHROOTDIR}/dev/${_label}" ]; then
-				rm ${CHROOTDIR}/dev/${_label}
+			if [ -e "/dev/${_label}" ]; then
+				rm /dev/${_label}
 			fi
 		done
 	fi