summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-09-30 17:29:32 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:25 +0100
commitcabb8315cebe1c508e4926f9f7343698a01f17cd (patch)
tree39d6be880e3701205444dd8b856a2c6f189c53f4 /scripts/build
parent0f72856a5e681bbdc0d351cc77e525da663a7ca3 (diff)
downloadlive-build-cabb8315cebe1c508e4926f9f7343698a01f17cd.zip
live-build-cabb8315cebe1c508e4926f9f7343698a01f17cd.tar.gz
Fixing squashfs.sort location with --build-with-chroot false.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary_rootfs11
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 27af099..b5ca068 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -307,7 +307,16 @@ case "${LB_CHROOT_FILESYSTEM}" in
if [ -f config/binary_rootfs/squashfs.sort ]
then
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
- cp config/binary_rootfs/squashfs.sort chroot #FIXME
+
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ cp config/binary_rootfs/squashfs.sort chroot
+ ;;
+
+ false)
+ cp config/binary_rootfs/squashfs.sort .
+ ;;
+ esac
fi
case "${LB_BUILD_WITH_CHROOT}" in