diff options
| author | intrigeri <intrigeri@boum.org> | 2010-09-30 17:30:23 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:20:33 +0100 |
| commit | d7353ff96fb96f76177d4cde7f76a0d01597e0fa (patch) | |
| tree | 422eb5c4f404b40361f97943c4d29fdcf9e26897 /scripts/build | |
| parent | 607f87914bfa8a5999ac6ccef1eefb66501d4cbb (diff) | |
| download | vyos-live-build-d7353ff96fb96f76177d4cde7f76a0d01597e0fa.tar.gz vyos-live-build-d7353ff96fb96f76177d4cde7f76a0d01597e0fa.zip | |
Fixing squashfs.sort location with --build-with-chroot false.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/lb_binary_rootfs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index 483fdfb86..173c5cc3f 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 |