snap-failure: run snapd with the correct keyring mode #15079
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
valentindavid
added
the
Run nested
bboozzoo
reviewed
Feb 14, 2025
cmd/snap-failure/cmd_snapd.go
Outdated
| // KeyringMode=shared or make the re-seeding not initialize | ||
| // fdestate | ||
| cmd := runCmd(snapdPath, nil, []string{"SNAPD_REVERT_TO_REV=" + prevRev, "SNAPD_DEBUG=1"}) | ||
| cmd := runCmd("systemd-run", []string{"--collect", "--wait", "--property=KeyringMode=shared", fmt.Sprintf("--setenv=SNAPD_REVERT_TO_REV=%s", prevRev), "--setenv=SNAPD_DEBUG=1", "--", snapdPath}, []string{}) |
There was a problem hiding this comment.
--wait is from systemd 232+ and I think it should work with core18, but please double check --collect
Suggested change
| cmd := runCmd("systemd-run", []string{"--collect", "--wait", "--property=KeyringMode=shared", fmt.Sprintf("--setenv=SNAPD_REVERT_TO_REV=%s", prevRev), "--setenv=SNAPD_DEBUG=1", "--", snapdPath}, []string{}) | |
| cmd := runCmd("systemd-run", | |
| []string{"--collect", "--wait", | |
| "--property=KeyringMode=shared", | |
| "--setenv=SNAPD_REVERT_TO_REV="+prevRev, | |
| "--setenv=SNAPD_DEBUG=1", | |
| "--", snapdPath, | |
| }, []string{}) |
There was a problem hiding this comment.
Bionic should have 237. And this should have been added in 236.
|
Mon Feb 17 14:18:02 UTC 2025 Failures:Executing:
Restoring:
|
valentindavid
force-pushed
the
valentindavid/snap-failure-kerying-mode
branch
from
67e7f2c to
9a8abbf
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #15079 +/- ##
==========================================
- Coverage 78.07% 77.80% -0.27%
==========================================
Files 1182 1166 -16
Lines 157743 156826 -917
==========================================
- Hits 123154 122016 -1138
- Misses 26943 27221 +278
+ Partials 7646 7589 -57
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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.
No description provided.