tests/lib/prepare: drop workarounds for rpmbuild rewriting /bin/sh #7806
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
zyga
approved these changes
Nov 27, 2019
| case "$SPREAD_SYSTEM" in | ||
| fedora-*|centos-*|amazon-*) | ||
| # RPM can rewrite shebang to #!/usr/bin/sh | ||
| sed -i -e '1 s;#!/usr/bin/sh;#!/bin/sh;' squashfs-root/usr/lib/snapd/snap-device-helper |
There was a problem hiding this comment.
For some context. The reason this was here in the first place is that we rebuild snapd on, say Fedora 31, and repackage the 16.04-based core snap with the package built on fedora. This now puts the /usr/bin/sh shebang line inside the core snap, which doesn't exist there.
We fixed this with cc4e91c so the workaround is no longer necessary.
There was a problem hiding this comment.
@bboozzoo can you please include this in the commit message ^
There was a problem hiding this comment.
I'll update the commit message and force push
mvo5
approved these changes
Nov 27, 2019
bboozzoo
force-pushed
the
bboozzoo/drop-rpm-rewrite
branch
from
6e49261
to
65c14a0
Compare
Drop the workaround for rpmbuild rewriting /bin/sh to /usr/bin/sh. The snap-confine device cgroup setup would call snap-device-helper after pivoting to the snap mount namespace. This used to fail on Fedora because of the mangling done by rpm packaging that changes /bin/sh to /usr/bin/sh. In which, case we would try to run snap-device-helper using an interpreter at /usr/bin/sh that does not exist within the snap mount ns. The downstream packaging defined macros that prevented this scenario. Since snapcore#7049, snap-confine calls snap-device-helper before pivoting to the snap mount namespace, thus the host interpreter is still visible at the correct path. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
bboozzoo
force-pushed
the
bboozzoo/drop-rpm-rewrite
branch
from
65c14a0
to
2fa0b1f
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.
Drop the workaround for rpmbuild rewriting /bin/sh to /usr/bin/sh.