summaryrefslogtreecommitdiff
path: root/scripts/build/binary_chroot
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-10-22 20:41:40 +0200
committerDaniel Baumann <daniel@debian.org>2012-10-22 20:41:40 +0200
commitb7c3e69b0df19df50d8a4e4f1352c3370f7cee8c (patch)
treeb0199002f41e170867dcce97ca6e0c12223bfa3a /scripts/build/binary_chroot
parentf8d11f4698799550edc39dd07101f3a953a875c6 (diff)
downloadvyos-live-build-b7c3e69b0df19df50d8a4e4f1352c3370f7cee8c.tar.gz
vyos-live-build-b7c3e69b0df19df50d8a4e4f1352c3370f7cee8c.zip
Renaming config/binary_rootfs to simply config/rootfs.
Diffstat (limited to 'scripts/build/binary_chroot')
-rwxr-xr-xscripts/build/binary_chroot6
1 files changed, 3 insertions, 3 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