From 7d88382c9e318dc40660a98cd68424cdcd188ed9 Mon Sep 17 00:00:00 2001 From: Andre Kantek Date: Thu, 21 Sep 2023 12:12:14 -0300 Subject: [PATCH] Remove machine-id generated from build from subcloud install As it was done in the previous change for local installation https://review.opendev.org/c/starlingx/metal/+/863322 This change removes the ISO embedded machine-id file to allow the value regeneration after the first boot post install for subclouds that use the redfish protocol when added in a system controller. Test Plan [PASS] install 2 subclouds from the system controller containing the patch and check the values in /etc/machine-id and /var/lib/dbus/machine-id to unique for each subcloud Closes-Bug: 2037434 Change-Id: If7a631b5769cb499956a7e5ee33e3361a6230452 Signed-off-by: Andre Kantek --- kickstart/files/miniboot.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kickstart/files/miniboot.cfg b/kickstart/files/miniboot.cfg index 970e46ea..dd707f53 100644 --- a/kickstart/files/miniboot.cfg +++ b/kickstart/files/miniboot.cfg @@ -2819,6 +2819,11 @@ if [ -f "${IMAGE_ROOTFS}/etc/network/interfaces.d/ifcfg-vlan${mgmt_vlan}" ]; the ilog "$(cat "${IMAGE_ROOTFS}/etc/network/interfaces.d/ifcfg-vlan${mgmt_vlan}")" fi +# Clean machine-id file, it needs to be generated after install. +# It must be unique per installation because it is used to generate +# random MACs for SR-IOV VFs, among other resources. +find / -name machine-id | xargs rm -fv + true %end