Remove machine-id on pre generated images so it's unique on each deployed device

As referenced on the arm list [1] and as already being done on the docker image we
should remove the unique /etc/machine-id file on compose artifacts to ensure it's
regenerated and unique on each deployed host/device. This unifies the process across
all base ks so it's inherited for each artifact.

[1] https://lists.fedoraproject.org/archives/list/arm@lists.fedoraproject.org/message/Q3YZVF5P2OLLPUJQ2LYZSTKWGGDIU6QO/

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
Peter Robinson 2016-09-13 08:55:44 +01:00
parent 2ac5e77a03
commit 1f1184c77c
4 changed files with 11 additions and 0 deletions

View File

@ -77,5 +77,8 @@ dnf -y remove dracut-config-generic
# fails due to RHBZ #1369794 # fails due to RHBZ #1369794
/sbin/chkconfig network off /sbin/chkconfig network off
# Remove machine-id on pre generated images
rm -f /etc/machine-id
%end %end

View File

@ -270,5 +270,8 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
# fails due to RHBZ #1369794 # fails due to RHBZ #1369794
/sbin/chkconfig network on /sbin/chkconfig network on
# Remove machine-id on pre generated images
rm -f /etc/machine-id
%end %end

View File

@ -87,6 +87,7 @@ systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connec
umount /run umount /run
systemd-tmpfiles --create --boot systemd-tmpfiles --create --boot
# Remove machine-id on pre generated images
rm -f /etc/machine-id rm -f /etc/machine-id
%end %end

View File

@ -325,6 +325,9 @@ rm -f /boot/*-rescue*
# fails due to RHBZ #1369794 # fails due to RHBZ #1369794
/sbin/chkconfig network off /sbin/chkconfig network off
# Remove machine-id on pre generated images
rm -f /etc/machine-id
%end %end
@ -336,4 +339,5 @@ if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
fi fi
%end %end