From 007c54025d0787e975f6013dff3081430075863b Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 19 May 2017 09:40:49 -0400 Subject: [PATCH] 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 a4ae07133928d8614905d12145ddc545f761c151) --- fedora-docker-base.ks | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks index b1e3e05..963d1c7 100644 --- a/fedora-docker-base.ks +++ b/fedora-docker-base.ks @@ -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