svn commit: r285019 - head/release/tools

Glen Barber gjb at FreeBSD.org
Thu Jul 2 02:33:59 UTC 2015


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


More information about the svn-src-all mailing list