diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-19 00:19:26 +0000 |
---|---|---|
committer | Luca Boccassi <bluca@debian.org> | 2020-03-20 10:19:33 +0000 |
commit | 945a166f75f7bf0419a7caefa7e7337119732929 (patch) | |
tree | 7fd12a81255c8d9a65e9a309510b93fc71a0929e /scripts/build/binary_iso | |
parent | d6a80d3d4dfe7153ba48c4fb1d1037557223a233 (diff) | |
download | vyos-live-build-945a166f75f7bf0419a7caefa7e7337119732929.tar.gz vyos-live-build-945a166f75f7bf0419a7caefa7e7337119732929.zip |
strip progress-linux distro hacks
progress-linux, as discussed in MR #142 ([1]) is a little known distro,
which appears to be little more than a personal project of the original
author of live-build.
given that, the expense of maintaining all of these old hacks for it
cannot be justified. it is not known whether or not live-build is even
used with respect to it since the author abandoned live-build some
years ago.
also, at least one past change in live-build possibly broke progress-linux
compatibility anyway, which would have required progress-linux users of
live-build to use a custom progress-linux config, or a progress-linux
fork of live-build, and there is no knowing how much of the hacks in this
"upstream" codebase any user of progress-linux currently relies upon.
and again, progress-linux appears to just be a personal project of
Daniel's, with afaik very little userbase. (Daniel seems to be the only
developer working on the project which speaks to how small it is).
[1]: https://salsa.debian.org/live-team/live-build/-/merge_requests/142
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_iso')
-rwxr-xr-x | scripts/build/binary_iso | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index f3abe6bc8..d253baaaf 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -133,19 +133,9 @@ do ;; syslinux) - case "${LB_MODE}" in - progress-linux) - XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/boot.bin -c boot/boot.cat" - XORRISO_EXCLUDE="boot/boot.bin" - ;; - - *) - XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat" - XORRISO_EXCLUDE="isolinux/isolinux.bin" - ;; - esac - + XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat" XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" + XORRISO_EXCLUDE="isolinux/isolinux.bin" ;; grub-efi) |