Merge pull request #2778 from thaJeztah/1.1_backport_ignore_modprobe_failures

estesp · web-flow · commit a7dff7edfea3 · 2018-11-10T14:10:48.000-05:00
[release/1.1] cherry-pick: Ignore modprobe failures in ExecStartPre (systemd unit)
diff --git a/containerd.service b/containerd.service
@@ -4,7 +4,7 @@ Documentation=https://containerd.io
 After=network.target
 
 [Service]
-ExecStartPre=/sbin/modprobe overlay
+ExecStartPre=-/sbin/modprobe overlay
 ExecStart=/usr/local/bin/containerd
 Delegate=yes
 KillMode=process
diff --git a/docs/ops.md b/docs/ops.md
@@ -49,7 +49,7 @@ Documentation=https://containerd.io
 After=network.target
 
 [Service]
-ExecStartPre=/sbin/modprobe overlay
+ExecStartPre=-/sbin/modprobe overlay
 ExecStart=/usr/local/bin/containerd
 Delegate=yes
 KillMode=process
