Renaming config/binary_rootfs to simply config/rootfs.

3 files changed, 12 insertions, 12 deletions

diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot
index 4d4500e55..598fff5fc 100755
--- a/scripts/build/binary_chroot
+++ b/scripts/build/binary_chroot
@@ -97,18 +97,18 @@ fi
 ${LB_ROOT_COMMAND} mv chroot.tmp chroot/chroot
 
 # Handling chroot excludes
-if [ -f config/binary_rootfs/excludes ] && [ "${LB_CHROOT_FILESYSTEM}" != "squashfs" ]
+if [ -f config/rootfs/excludes ] && [ "${LB_CHROOT_FILESYSTEM}" != "squashfs" ]
 then
 	case "${LB_BUILD_WITH_CHROOT}" in
 		true)
-			cp config/binary_rootfs/excludes chroot/chroot/excludes
+			cp config/rootfs/excludes chroot/chroot/excludes
 			# Not using Chroot() here because we want explicitly /bin/bash (for the time being)
 			chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
 			rm -f chroot/chroot/excludes
 			;;
 
 		false)
-			cp config/binary_rootfs/excludes chroot/excludes
+			cp config/rootfs/excludes chroot/excludes
 			# Not using Chroot() here because we want explicitly /bin/bash (for the time being)
 			chroot chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
 			rm -f chroot/excludes
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 41c284ac2..0b125764b 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -342,17 +342,17 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
 		fi
 
-		if [ -f config/binary_rootfs/squashfs.sort ]
+		if [ -f config/rootfs/squashfs.sort ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
 
 			case "${LB_BUILD_WITH_CHROOT}" in
 				true)
-					cp config/binary_rootfs/squashfs.sort chroot
+					cp config/rootfs/squashfs.sort chroot
 					;;
 
 				false)
-					cp config/binary_rootfs/squashfs.sort .
+					cp config/rootfs/squashfs.sort .
 					;;
 			esac
 		fi
@@ -365,9 +365,9 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 		case "${LB_BUILD_WITH_CHROOT}" in
 			true)
-				if [ -e config/binary_rootfs/excludes ]
+				if [ -e config/rootfs/excludes ]
 				then
-					cp config/binary_rootfs/excludes chroot/excludes
+					cp config/rootfs/excludes chroot/excludes
 
 					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef /excludes"
 				fi
@@ -435,9 +435,9 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				;;
 
 			false)
-				if [ -e config/binary_rootfs/excludes ]
+				if [ -e config/rootfs/excludes ]
 				then
-					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef config/binary_rootfs/excludes"
+					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef config/rootfs/excludes"
 				fi
 
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
diff --git a/scripts/build/config b/scripts/build/config
index 852dfe26a..f4598f8fa 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -190,7 +190,7 @@ Local_arguments ()
 				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 
 				# Dump contents of directories that contain text files
-				for DIRECTORY in config/package-lists config/apt config/preseed config/binary_rootfs
+				for DIRECTORY in config/package-lists config/apt config/preseed config/rootfs
 				do
 					if Find_files "${DIRECTORY}"
 					then
@@ -1286,7 +1286,7 @@ mkdir -p config/includes.binary
 mkdir -p config/includes.binary_debian-installer
 mkdir -p config/packages.binary
 mkdir -p config/package-lists
-mkdir -p config/binary_rootfs
+mkdir -p config/rootfs
 
 cat > config/binary << EOF
 # config/binary - options for live-build(7), binary stage