diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-21 10:55:55 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:09 +0100 |
| commit | 36bddd25da6519e9d6effa254106e54de87bd711 (patch) | |
| tree | 72adc8c725a94ed8d941f1ac43c4b7a600dff8ae /helpers/binary_rootfs | |
| parent | 34798918306e7aa5d080e274a5d58c8b5fa983e8 (diff) | |
| download | vyos-live-build-36bddd25da6519e9d6effa254106e54de87bd711.tar.gz vyos-live-build-36bddd25da6519e9d6effa254106e54de87bd711.zip | |
Renaming --chroot-build to --build-with-chroot.
Diffstat (limited to 'helpers/binary_rootfs')
| -rwxr-xr-x | helpers/binary_rootfs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs index 635adbbd9..c813d4648 100755 --- a/helpers/binary_rootfs +++ b/helpers/binary_rootfs @@ -83,7 +83,7 @@ do done # Handling chroot excludes -if [ "${LH_CHROOT_BUILD}" = "true" ] +if [ "${LH_BUILD_WITH_CHROOT}" = "true" ] then if [ -f config/binary_rootfs/excludes ] then @@ -135,7 +135,7 @@ case "${LH_CHROOT_FILESYSTEM}" in RESERVED_PERCENTAGE="--reserved-percentage" - case "${LH_CHROOT_BUILD}" in + case "${LH_BUILD_WITH_CHROOT}" in true) Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}" @@ -219,7 +219,7 @@ case "${LH_CHROOT_FILESYSTEM}" in JFFS2_OPTIONS="--eraseblock=${LH_JFFS2_ERASEBLOCK}" fi - case "${LH_CHROOT_BUILD}" in + case "${LH_BUILD_WITH_CHROOT}" in true) Chroot chroot "mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output filesystem.jffs2" @@ -288,7 +288,7 @@ case "${LH_CHROOT_FILESYSTEM}" in rm -rf binary/${INITFS}/filesystem.dir fi - case "${LH_CHROOT_BUILD}" in + case "${LH_BUILD_WITH_CHROOT}" in true) mv chroot/chroot binary/${INITFS}/filesystem.dir ;; @@ -334,7 +334,7 @@ case "${LH_CHROOT_FILESYSTEM}" in cp config/binary_rootfs/squashfs.sort chroot #FIXME fi - case "${LH_CHROOT_BUILD}" in + case "${LH_BUILD_WITH_CHROOT}" in true) # Create image Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}" @@ -421,7 +421,7 @@ case "${LH_CHROOT_FILESYSTEM}" in rm -rf binary fi - case "${LH_CHROOT_BUILD}" in + case "${LH_BUILD_WITH_CHROOT}" in true) mv chroot/chroot binary ;; |