[13.4-stable] Simplify mkimage-iso-efi entrypoint script and its single consumer in… #4488
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OhmSpectator
changed the title
|
It looks like there are conflicts in |
|
Strange, I don't see other changes between 13.4-stables and master in this file... |
|
@andrewd-zededa can you try rebasing it on the upstreams 13.4-stable branch? |
… pkg/eve/runme.sh The entrypoint script make-efi in mkimage-iso-efi is used in 2 places: * the script makeiso.sh, where it expects to pipe a tar stream to the container's stdin * the script runme.sh, as the entrypoint to pkg/eve, i.e. the container image lfedge/eve This does not change the first use case. The make-efi is changed so that it *always* reads a tar stream from stdin. This makes it a much simpler program to understand (consistency is nice). For the case of runme.sh, that script is changed so that instead of assuming it has the installer in a particular directory, it explicitly takes the installer.img, unpackages it into a temporary working directory, and creates a tar stream from the contents of that directory, so that it can stream it to make-efi. This has the important benefit of fixing the bug wherein making an installer_iso from `docker run lfedge/eve installer_iso` gives an ISO that does not install correctly. Signed-off-by: Avi Deitcher <avi@deitcher.net> (cherry picked from commit 4df571e)
|
eriknordmark
force-pushed
the
backport-pr4480-13.4-stable
branch
from
4e9a3f3 to
c6dbbab
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… pkg/eve/runme.sh
Backport of #4480
The entrypoint script make-efi in mkimage-iso-efi is used in 2 places:
This does not change the first use case. The make-efi is changed so that it always reads a tar stream from stdin. This makes it a much simpler program to understand (consistency is nice).
For the case of runme.sh, that script is changed so that instead of assuming it has the installer in a particular directory, it explicitly takes the installer.img, unpackages it into a temporary working directory, and creates a tar stream from the contents of that directory, so that it can stream it to make-efi.
This has the important benefit of fixing the bug wherein making an installer_iso from
docker run lfedge/eve installer_isogives an ISO that does not install correctly.Signed-off-by: Avi Deitcher avi@deitcher.net
(cherry picked from commit 4df571e)