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 <dusty@dustymabe.com>
This commit is contained in:
Dusty Mabe 2017-10-31 11:50:56 -04:00
parent 6553b85eba
commit 26be0f2d85
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671

View File

@ -84,12 +84,12 @@ rm -f /tmp/ks-script*
#Mask mount units and getty service so that we don't get login prompt #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 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 # Remove machine-id on pre generated images
rm -f /etc/machine-id rm -f /etc/machine-id
touch /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 %end