From 26be0f2d850f2107204f6d1c19577276e78eb85d Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 31 Oct 2017 11:50:56 -0400 Subject: [PATCH] Move manipulation of machine-id above systemd-tmpfiles For complicated reasons the systemd-tmpfiles call acutally fails and causes the rest of the kspost to not get run. This commit makes it the last thing to get run. This has been fixed in future branches with a more complicated set of patches: - https://pagure.io/fedora-kickstarts/c/a4ae071 - https://pagure.io/fedora-kickstarts/c/f6ecdc3 Signed-off-by: Dusty Mabe --- fedora-docker-base.ks | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks index 0df5c04..e797892 100644 --- a/fedora-docker-base.ks +++ b/fedora-docker-base.ks @@ -84,12 +84,12 @@ rm -f /tmp/ks-script* #Mask mount units and getty service so that we don't get login prompt systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service -# Fix /run/lock breakage since it's not tmpfs in docker -umount /run -systemd-tmpfiles --create --boot - # Remove machine-id on pre generated images rm -f /etc/machine-id touch /etc/machine-id +# Fix /run/lock breakage since it's not tmpfs in docker +umount /run +systemd-tmpfiles --create --boot + %end