diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 07:39:58 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 07:39:58 +0100 |
| commit | 1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034 (patch) | |
| tree | b98ff62505af2e1d3b2e0e394ffb92f81239cfec /scripts/build/binary_netboot | |
| parent | 7b6dfd9d167b5ef09c6c1812f17e6df302f45897 (diff) | |
| download | vyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.tar.gz vyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.zip | |
Cleaning up from python removal (LIVE_IMAGE_ARCHITECTURE).
Diffstat (limited to 'scripts/build/binary_netboot')
| -rwxr-xr-x | scripts/build/binary_netboot | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot index 00a0233b9..2290ac10d 100755 --- a/scripts/build/binary_netboot +++ b/scripts/build/binary_netboot @@ -48,7 +48,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ] +if [ "${LB_ARCHITECTURES}" = "sparc" ] then # Checking depends Check_package chroot/usr/bin/elftoaout sparc-utils @@ -119,7 +119,7 @@ then fi # Remove old binary -rm -f ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.xz +rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.xz # Creating image file ROOT_DIR=$(basename ${LB_NET_ROOT_PATH}) @@ -142,23 +142,23 @@ cd binary.tmp mkdir tftpboot/live mv */live/vmlinuz* */live/initrd* tftpboot/live -tar cf ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar * +tar cf ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar * case "${LB_COMPRESSION}" in bzip2) - bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar + bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ;; gzip) - gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar + gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ;; lzip) - lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar + lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ;; xz) - xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar + xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ;; none) |