Accepting request 536960 from home:cyphar:containers:containerd_fix

- Set --start-timeout=2m by default to match upstream. bsc#1064926

OBS-URL: https://build.opensuse.org/request/show/536960
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=62
This commit is contained in:
Aleksa Sarai 2017-10-26 19:38:40 +00:00 committed by Git OBS Bridge
parent 9b931700e9
commit ec48492ea8
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 26 19:27:48 UTC 2017 - asarai@suse.com
- Set --start-timeout=2m by default to match upstream. bsc#1064926
-------------------------------------------------------------------
Thu Oct 26 17:31:18 UTC 2017 - asarai@suse.com

View File

@ -6,7 +6,7 @@ Requires=containerd.socket
[Service]
EnvironmentFile=/etc/sysconfig/containerd
ExecStart=/usr/sbin/containerd --listen fd:// $CONTAINERD_OPTS
ExecStart=/usr/sbin/containerd --listen fd:// --start-timeout=2m $CONTAINERD_OPTS
LimitNOFILE=1048576
LimitNPROC=1048576
LimitCORE=infinity