diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-06 18:43:41 +0100 |
---|---|---|
committer | Raphaƫl Hertzog <hertzog@debian.org> | 2020-04-23 16:54:31 +0000 |
commit | 83d9145257220d39e487021e993344adafe71b8a (patch) | |
tree | dfccbf1f040b287f198dc414b3a19f25af59805a /scripts/build/binary_netboot | |
parent | 41738b1932f0830a2b7eb92e62540a2246105a11 (diff) | |
download | vyos-live-build-83d9145257220d39e487021e993344adafe71b8a.tar.gz vyos-live-build-83d9145257220d39e487021e993344adafe71b8a.zip |
config: s/LIVE_IMAGE_NAME/LB_IMAGE_NAME/
no backwards compatibility hack for reading the old var from existing
saved config used because this was previously stored in the alternate
format config/build file.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_netboot')
-rwxr-xr-x | scripts/build/binary_netboot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot index 14a6d9bc3..a324e7fc1 100755 --- a/scripts/build/binary_netboot +++ b/scripts/build/binary_netboot @@ -42,7 +42,7 @@ Check_stagefile Acquire_lockfile # Remove old binary -rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.xz +rm -f ${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.gz ${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.bz2 ${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.xz ${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar.xz # Creating image file ROOT_DIR=${LB_MODE}-live @@ -57,23 +57,23 @@ cd binary.tmp mkdir tftpboot/live mv */live/vmlinuz* */live/initrd* tftpboot/live -tar cf ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar * +tar cf ../${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar * case "${LB_COMPRESSION}" in bzip2) - bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar + bzip2 ${BZIP2_OPTIONS} ../${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ;; gzip) - gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar + gzip ${GZIP_OPTIONS} ../${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ;; lzip) - lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar + lzip ${LZIP_OPTIONS} ../${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ;; xz) - xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar + xz ${XZ_OPTIONS} ../${LB_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ;; none) |