Skip to content

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

Merged
estesp merged 1 commit intocontainerd:release/1.2from
thaJeztah:1.2_backport_ignore_modprobe_failures
Nov 11, 2018
Merged

[release/1.2] cherry-pick: Ignore modprobe failures in ExecStartPre (systemd unit)#2779
estesp merged 1 commit intocontainerd:release/1.2from
thaJeztah:1.2_backport_ignore_modprobe_failures

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

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

git checkout -b 1.2_backport_ignore_modprobe_failures upstream/release/1.2
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 <[email protected]>
(cherry picked from commit 555ea3f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2779 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2779   +/-   ##
=======================================
  Coverage   43.72%   43.72%           
=======================================
  Files         100      100           
  Lines       10734    10734           
=======================================
  Hits         4693     4693           
  Misses       5311     5311           
  Partials      730      730
Flag Coverage Δ
#linux 47.39% <ø> (ø) ⬆️
#windows 40.89% <ø> (ø) ⬆️

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 96d3078...c4acd17. Read the comment docs.

@estesp
Copy link
Copy Markdown
Member

estesp commented Nov 10, 2018

Is this just a GitHub UI problem that it isn’t listing the target as release/1.2 branch? Since I merged the master version of the PR, this should show merge conflicts if it was really targeting master; not sure how to investigate further.

@thaJeztah
Copy link
Copy Markdown
Member Author

Hm interesting. Could also be a slip-up on my side (looking from my phone right now)

OTOH, if this was targeting master, it would usually show as "merged" on github (once the other PR got merged)

Let me try editing the PR's target

(good catch btw, thanks!)

@thaJeztah thaJeztah changed the base branch from master to release/1.2 November 11, 2018 00:41
@thaJeztah
Copy link
Copy Markdown
Member Author

Changed to release/1.2

Let's blame erm... the weather... politics... solar flares...

(pick one)

😅🤗

Copy link
Copy Markdown
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 cd0ecb7 into containerd:release/1.2 Nov 11, 2018
@thaJeztah thaJeztah deleted the 1.2_backport_ignore_modprobe_failures branch November 12, 2018 15:15
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.

4 participants