Add compatibility for busybox mktemp to sed --in-place check #11269
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
ghost
approved these changes
Dec 2, 2020
ghost
added
the
behlendorf
reviewed
Dec 2, 2020
Busybox's mktemp requires at least six X's in the template, causing the current sed --in-place check to fail because the file does not exist. This change adds additional X's to mktemp templates that do not already have at least six X's in them. Signed-off-by: Quentin Zdanis <zdanisq@gmail.com>
qzdanis
force-pushed
the
fix/busybox-mktemp
branch
from
1b8c351
to
93a7031
Compare
Done! I've also edited the PR description to be more accurate. |
behlendorf
approved these changes
Dec 2, 2020
behlendorf
added
Status: Accepted
This was referenced Dec 3, 2020
ghost
pushed a commit
to zfsonfreebsd/ZoF
that referenced
this pull request
Dec 23, 2020
Busybox's mktemp requires at least six X's in the template, causing the current sed --in-place check to fail because the file does not exist. This change adds additional X's to mktemp templates that do not already have at least six X's in them. Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Quentin Zdanis <zdanisq@gmail.com> Closes openzfs#11269
behlendorf
pushed a commit
that referenced
this pull request
Dec 23, 2020
Busybox's mktemp requires at least six X's in the template, causing the current sed --in-place check to fail because the file does not exist. This change adds additional X's to mktemp templates that do not already have at least six X's in them. Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Quentin Zdanis <zdanisq@gmail.com> Closes #11269
jsai20
pushed a commit
to jsai20/zfs
that referenced
this pull request
Mar 30, 2021
Busybox's mktemp requires at least six X's in the template, causing the current sed --in-place check to fail because the file does not exist. This change adds additional X's to mktemp templates that do not already have at least six X's in them. Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Quentin Zdanis <zdanisq@gmail.com> Closes openzfs#11269
sempervictus
pushed a commit
to sempervictus/zfs
that referenced
this pull request
May 31, 2021
Busybox's mktemp requires at least six X's in the template, causing the current sed --in-place check to fail because the file does not exist. This change adds additional X's to mktemp templates that do not already have at least six X's in them. Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Quentin Zdanis <zdanisq@gmail.com> Closes openzfs#11269
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.
Motivation and Context
Busybox's
mktemprequires six X's in the template, while the currentsed --in-placecheck invokesmktempwith three. This causesmktempto fail as the pattern isn't what busybox is expecting.Description
This PR changes the
mktemptemplate fromconftest.XXXtoconftest.XXXXXXinconfig/always-sed.m4. It also extends the templates inconfig/deb.amandscripts/zfs-tests.shto contain six X's.How Has This Been Tested?
Change was tested via regeneration of
configurescript in a busybox-based docker container and diffing the results against the current master branch to ensure the only change is themktempinvocation. The resulting script was also run to check if thesed --in-placecheck passes.Types of changes
Checklist:
Signed-off-by.