This is a *partial* cherry-pick from commitchanges/92/36992/1c3d753562, excluding all the testing related changes and keeping only viable and safe changes. Relevant changes included here: * Stick grml2usb version to v0.17.0, instead of relying on the grml2usb version available on the host system (being 0.14.14 on Debian/stretch as present on our current build hosts). For arbitrary addon file names we need grml2iso (which uses grml2usb underneath) from grml2usb >=0.17.0. FTR, grml2iso and grml2usb can be executed from within the git repository, assuming all relevant tools are present * No longer invoke isohybrid on the resulting ISO, instead rely on grml2iso behaviour (which also checks for EFI support and enables according switches as needed) * Fix usage instructions in t/Dockerfile (it's "deployment-iso-buster" and not "lua-ngcp-kamailio-buster") This is in preparation for backporting/cherry-pick commit608dd0367("TT#73210 Use grml2usb v0.14.14 when handling grml64-small_2018.04.11-efi.iso") to use a specific grml2usb version when dealing with special case ISO grml64-small_2018.04.11-efi.iso for mr6.5 release. Change-Id: I67e3f85bbe86bd1b3ee709161504b5250ca5d7fe (*partially* cherry picked from commitc3d753562d)
parent
2699053fea
commit
f9d97a1ae2
Loading…
Reference in new issue