app-misc/ca-certificates|sys-apps/baselayout: Run flatcar-tmpfiles|clean-ca-certificates only once

The flatcar-tmpfiles and clean-ca-certificates services were run
many times and finally failed to run because they were spawned too
often during the allowed time period.
Mark them as active after they ran once. Also ensure that when they
run all mounts are ready.
Pulls in https://github.com/flatcar-linux/baselayout/pull/4
This commit is contained in:
Kai Lüke 2020-07-24 13:26:40 +02:00
parent c39b2f2901
commit 4ac7513875
4 changed files with 4 additions and 3 deletions

View File

@ -2,11 +2,12 @@
Description=Clean up broken links in /etc/ssl/certs Description=Clean up broken links in /etc/ssl/certs
# Since other services depend on the certificate store run this early # Since other services depend on the certificate store run this early
DefaultDependencies=no DefaultDependencies=no
Wants=systemd-tmpfiles-setup.service Wants=systemd-tmpfiles-setup.service sysroot.mount sysroot-usr.mount
After=systemd-tmpfiles-setup.service After=systemd-tmpfiles-setup.service sysroot.mount sysroot-usr.mount
Before=sysinit.target Before=sysinit.target
ConditionPathIsReadWrite=/etc/ssl/certs ConditionPathIsReadWrite=/etc/ssl/certs
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/find -L /etc/ssl/certs -type l -delete ExecStart=/usr/bin/find -L /etc/ssl/certs -type l -delete

View File

@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="355e0fa57068ce89a55109ca0e8a1a3f1fa0968e" # flatcar-master CROS_WORKON_COMMIT="2b8e4de42771033072324713ba8919248585d263" # flatcar-master
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi