diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-01 10:58:47 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 15:54:19 +0200 |
| commit | 6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 (patch) | |
| tree | c91a79037457e7bb2c0630fa8c065bee6c465bad /scripts/build/binary_netboot | |
| parent | 6def2c27be28169cf3e0757a6928e3f13de157a8 (diff) | |
| download | vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.tar.gz vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.zip | |
rename LB_ARCHITECTURES to LB_ARCHITECTURE
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1
to keep the renaming simple, but leaving the variable plural is a cause
for confusion.
since this property is stored in the INI style config/build config file
rather than a shell script based one, at the property there is already
singular, there was no need for a backwards compatibility hack.
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 0847bdc60..14a6d9bc3 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_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 +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 # 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_ARCHITECTURES}.netboot.tar * +tar cf ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar * case "${LB_COMPRESSION}" in bzip2) - bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar + bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ;; gzip) - gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar + gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ;; lzip) - lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar + lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ;; xz) - xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar + xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURE}.netboot.tar ;; none) |