[release/1.1] cherry-pick: Ignore modprobe failures in ExecStartPre (systemd unit)#2778
Merged
estesp merged 1 commit intocontainerd:release/1.1from Nov 10, 2018
Conversation
When running containerd inside LXC, due to systemd being unable to execute `modprobe overlay` inside the container (module is already loaded in host kernel). This patch adds a `-` prefix to the `ExecStartPre` command, so that failures are ignored, and the service can start as usual. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 555ea3f) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Codecov Report
@@ Coverage Diff @@
## release/1.1 #2778 +/- ##
============================================
Coverage 48.99% 48.99%
============================================
Files 85 85
Lines 7603 7603
============================================
Hits 3725 3725
Misses 3203 3203
Partials 675 675
Continue to review full report at Codecov.
|
AkihiroSuda
approved these changes
Nov 10, 2018
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Backport of #2776 for the 1.1 branch
fixes #2772 for the 1.1.x releases
cherry-pick was clean; no conflicts
When running containerd inside LXC, due to systemd being unable to execute
modprobe overlayinside the container (module is already loaded in host kernel).This patch adds a
-prefix to theExecStartPrecommand, so that failuresare ignored, and the service can start as usual.