davidlt
/
fedora-kickstarts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker-base: ignore return code of systemd-tmpfiles 

Ignore the return code of the systemd-tmpfiles command because
at this point we have already removed the /etc/machine-id (8f3beac)
and all tmpfiles lines with %m in them will fail and cause a bad
return code. Example failure:
  [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m

(cherry picked from commit a4ae071339)
This commit is contained in:
Dusty Mabe 2017-05-19 09:40:49 -04:00
parent 75d580c3fa
commit 007c54025d
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fedora-docker-base.ks
View File

@ -26,7 +26,14 @@ systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connec
# Fix /run/lock breakage since it's not tmpfs in docker
# This unmounts /run (tmpfs) and then recreates the files
# in the /run directory on the root filesystem of the container
#
# We ignore the return code of the systemd-tmpfiles command because
# at this point we have already removed the /etc/machine-id and all
# tmpfiles lines with %m in them will fail and cause a bad return
# code. Example failure:
# [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
#
umount /run
systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot
systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
%end