mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 07:21:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #893 from kinvolk/marga-kinvolk/revert-patch

Browse Source 
Revert adding explicit path to the containerd unit
This commit is contained in:
Marga Manterola 2021-03-10 11:47:12 +01:00 committed by GitHub
commit 57a396bd0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service vendored
View File

@ -6,8 +6,8 @@ After=network.target
[Service] [Service]
Delegate=yes Delegate=yes
Environment=CONTAINERD_CONFIG=/usr/share/containerd/config.toml Environment=CONTAINERD_CONFIG=/usr/share/containerd/config.toml
ExecStartPre=/usr/bin/mkdir -p /run/docker/libcontainerd ExecStartPre=mkdir -p /run/docker/libcontainerd
ExecStartPre=/usr/bin/ln -fs /run/containerd/containerd.sock /run/docker/libcontainerd/docker-containerd.sock ExecStartPre=ln -fs /run/containerd/containerd.sock /run/docker/libcontainerd/docker-containerd.sock
ExecStartPre=-/sbin/modprobe overlay ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/bin/containerd --config ${TORCX_UNPACKDIR}${TORCX_IMAGEDIR}${CONTAINERD_CONFIG} ExecStart=/usr/bin/containerd --config ${TORCX_UNPACKDIR}${TORCX_IMAGEDIR}${CONTAINERD_CONFIG}
KillMode=process KillMode=process