Commit 23b9ea6
fix(acl): write VHD firstboot addon to active UKI's extra.d directory
cleanup-vhd.sh restores /boot/acl/uki-addons/firstboot.addon.efi onto the
ESP so that VMs spawned from the built VHD see flatcar.first_boot=detected
and run Ignition.
Newer ACL images (PR mariner-org/ACL#27198) renamed the UKI from acl.efi
to vmlinuz-<version>.efi per UAPI. systemd-boot only auto-discovers addons
in <uki-name>.efi.extra.d/, so writing to the hardcoded acl.efi.extra.d/
left the addon undiscoverable on the new image. Without the addon, the
first-boot kernel cmdline arg is absent, Ignition runs in subsequent-boot
mode, /etc/.ignition-result.json reports userConfigProvided=true, the
enable-oem-cloudinit.service ExecCondition fails, oem-cloudinit never
runs, the AgentBaker scriptless #cloud-config customData is never
processed, and scriptless E2E tests time out.
Discover the active UKI dynamically (matching uki_addon.sh in
mariner-org/ACL/acl-scripts) so the same script works against both the
old acl.efi naming and the new vmlinuz-<version>.efi naming.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent 8b96add commit 23b9ea6
1 file changed
Lines changed: 13 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | | - | |
18 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
19 | 29 | | |
20 | 30 | | |
21 | 31 | | |
| |||
0 commit comments