Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Jul 2015 02:33:58 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r285019 - head/release/tools
Message-ID:  <201507020233.t622XwEj023191@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507020233.t622XwEj023191>