From 467bbf36dd220e2c7255ab219adc203f30ecfb55 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 18 Aug 2022 11:22:19 +1000 Subject: [PATCH] rocky : create machine-id in 9 It turns out we do need to create the machine-id for the same reason as on 8. This was being hidden by the bootloader choosing the root disk label from the host (see the dependent change). Change I3b518802d681b888916a5cc6a3dcf7e1b537da1e has modified the testing to use a different root-disk label, which should help catch this in the fututure. Depends-On: https://review.opendev.org/c/zuul/nodepool/+/853574 Change-Id: I64de66cac25fd2e051780fb4812e075c647eb76e --- .../elements/rocky-container/containerfiles/9 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/diskimage_builder/elements/rocky-container/containerfiles/9 b/diskimage_builder/elements/rocky-container/containerfiles/9 index f3b186aa..d542cc64 100644 --- a/diskimage_builder/elements/rocky-container/containerfiles/9 +++ b/diskimage_builder/elements/rocky-container/containerfiles/9 @@ -6,8 +6,7 @@ RUN systemctl unmask console-getty.service dev-hugepages.mount \ getty.target sys-fs-fuse-connections.mount systemd-logind.service \ systemd-remount-fs.service -# NOTE(neilhanlon) 2022-08-02 -# Unlike with the RL8 image, there does not appear to be a requirement to -# populate /etc/machine-id in order for /bin/kernel-install to correctly copy -# kernels into /boot. As a result, we will not run the machine setup -# systemd-machine-id-setup script +# /etc/machine-id needs to be populated for /bin/kernel-install to +# correctly copy kernels into /boot. We will clear this out in the +# final image. +RUN systemd-machine-id-setup