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

Add explicit paths to coreos-metadata and containerd executables

Browse Source 
While the execution of the unit may succeed by finding the executables
by searching the current PATH, calling `systemd-analyze verify` on the
units fails because this requires an absolute path.
This commit is contained in:
Margarita Manterola 2021-03-08 17:59:05 +01:00
parent 5995c9d9f5
commit 83ea2ed26b
2 changed files with 3 additions and 3 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=mkdir -p /run/docker/libcontainerd ExecStartPre=/usr/bin/mkdir -p /run/docker/libcontainerd
ExecStartPre=ln -fs /run/containerd/containerd.sock /run/docker/libcontainerd/docker-containerd.sock ExecStartPre=/usr/bin/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

2
sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service vendored
View File

@ -8,7 +8,7 @@ Restart=on-failure
RestartSec=10 RestartSec=10
Environment=COREOS_METADATA_OPT_PROVIDER=--cmdline Environment=COREOS_METADATA_OPT_PROVIDER=--cmdline
ExecStart=/usr/bin/coreos-metadata ${COREOS_METADATA_OPT_PROVIDER} --attributes=/run/metadata/flatcar ExecStart=/usr/bin/coreos-metadata ${COREOS_METADATA_OPT_PROVIDER} --attributes=/run/metadata/flatcar
ExecStartPost=ln -fs /run/metadata/flatcar /run/metadata/coreos ExecStartPost=/usr/bin/ln -fs /run/metadata/flatcar /run/metadata/coreos
[Install] [Install]
RequiredBy=metadata.target RequiredBy=metadata.target