Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.1] cherry-pick: Ignore modprobe failures in ExecStartPre (systemd unit) #2778

Merged

Conversation

thaJeztah
Copy link
Member

Backport of #2776 for the 1.1 branch
fixes #2772 for the 1.1.x releases

git checkout -b 1.1_backport_ignore_modprobe_failures upstream/release/1.1
git cherry-pick -s -S -x 555ea3fb43505512bba51563183a80b2d4a1d028

cherry-pick was clean; no conflicts

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.

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 <github@gone.nl>
(cherry picked from commit 555ea3f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov-io
Copy link

Codecov Report

Merging #2778 into release/1.1 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             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
Flag Coverage Δ
#linux 48.99% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b337430...36d2576. Read the comment docs.

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@estesp estesp merged commit a7dff7e into containerd:release/1.1 Nov 10, 2018
@thaJeztah thaJeztah deleted the 1.1_backport_ignore_modprobe_failures branch November 11, 2018 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants