cmd: rework reexec detection #3608
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
We need to special case the env handling for snapd re-execing from 2.21. In this version of snap/snapd we did set SNAP_REEXEC=0 when we re-execed. In this case we need to unset the reExecKey to ensure that subsequent run of snap/snapd (e.g. when using classic confinement) will *not* prevented from re-execing.
Check /proc/self/exe directly to determine if we already re-execed instead of relying on a environement key.
zyga
reviewed
Jul 20, 2017
This test validates that a snap using classic confinement can call into the snap itself. We discovered several bugs related to this behavior so the test will help to ensure this does not regress anymore. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Codecov Report
@@ Coverage Diff @@
## master #3608 +/- ##
==========================================
- Coverage 74.9% 74.88% -0.03%
==========================================
Files 380 380
Lines 32952 32961 +9
==========================================
Hits 24682 24682
- Misses 6477 6485 +8
- Partials 1793 1794 +1
Continue to review full report at Codecov.
|
chipaca
approved these changes
Jul 20, 2017
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 reworked the detection if we already re-execed or not. The logic is simply to check if the /proc/self/exe points inside the /snap/* directory. If that is the case we did already re-exec and there is no need to do anything further.
This also contains the bugfix when re-execing from snapd 2.21 which used to set
SNAP_REEXEC=0.