osutil: switch to -u UID:GID for strace-static #13950
Merged
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
Meulengracht
reviewed
May 9, 2024
| @@ -50,8 +50,8 @@ var ExcludedSyscalls = getExcludedSyscalls() | |||
|
|
|||
| func findStrace(u *user.User) (stracePath string, userOpts []string, err error) { | |||
| if path := filepath.Join(dirs.SnapMountDir, "strace-static", "current", "bin", "strace"); osutil.FileExists(path) { | |||
| // strace-static cannot resolve usernames, pass uid/gid instead | |||
| return path, []string{"--uid", u.Uid, "--gid", u.Gid}, nil | |||
| // Strace v6.9 supports -u UID:GID which avoids the need to resolve usernames with nss. | |||
There was a problem hiding this comment.
Since it required v6.9 just help me understand, do we bundle strace-static or how are we fulfilling this requirement?
There was a problem hiding this comment.
Ah right, looking more at this it needs the snap to be installed before this works?
What happens if I have an old strace snap?
There was a problem hiding this comment.
There are two cases:
- you have the
strace-staticsnap, just refresh or it doesn't work - you don't have the snap - this never worked then
There are about 200-300 users of strace-static, I think it's fine to do it without any extra complexity.
Meulengracht
approved these changes
May 10, 2024
|
The snap is currently building. Once it reaches candidate, I will re-trigger tests. |
|
The candidate channel is now ready (except for ppc and i386 which are EOL) |
This moves us off the custom patch and onto an upstream feature we've heled develop. The feature is not released yet but the patch has been integrated into the strace-static snap. Jira: SNAPDENG-19870 Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
The test tried to carefully match the error message to the version of strace used, which in turn depends on the host OS. It's much easier to just check both error mesages. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
zyga
force-pushed
the
SNAPDENG-19870
branch
2 times, most recently
from
f34c3a5
to
346d123
Compare
|
@bboozzoo please re-review the last patch. |
On systemd 255 systemctl kill fails after attempting to kill snapd.service with the following message: $ sudo systemctl kill --signal=SIGKILL snapd.service Failed to kill unit snapd.service: Failed to send signal SIGKILL to auxiliary processes: Invalid argument Kill the pid by hand to avoid triggering this behavior. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
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.
This moves us off the custom patch and onto an upstream feature we've heled develop. The feature is not released yet but the patch has been integrated into the strace-static snap.
canonical/strace-static-snap#3
Jira: SNAPDENG-19870