Skip to content

acl-grub: use dedicated /usr verity hash partitions consistent with UKI; fix arm64 test-image device-init timeout #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bfjelds merged 2 commits into from
Jul 24, 2026
Merged

acl-grub: use dedicated /usr verity hash partitions consistent with UKI; fix arm64 test-image device-init timeout #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f730598
acl-grub: use dedicated /usr verity hash partitions, consistent with UKI
Jul 23, 2026
bb73323
vm_image_util: extend device-init timeout to GRUB arm64 test images too
Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions build_library/disk_layout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,36 @@
"fs_type":"btrfs",
"fs_compression":"zstd",
"mount":"/usr",
"verity_hash":"4",
"features": ["prioritize", "verity"]
},
"4":{
"label":"HASH-A",
"uuid":"1fae528b-6baf-4efc-a226-2a23f9291ce6",
"type":"dps-usr-verity",
"blocks":"20480"
},
"5":{
"label":"USR-B",
"uuid":"e03dd35c-7c2d-4a47-b3fe-27f15780a57c",
"type":"flatcar-rootfs",
"blocks":"2097152",
"fs_blocks":"262144"
"fs_blocks":"262144",
"verity_hash":"6"
},
"5":{
"6":{
"label":"HASH-B",
"uuid":"accb60b1-1d72-4e05-9363-6fd51e2ce788",
"type":"dps-usr-verity",
"blocks":"20480"
},
"7":{
"label":"ROOT-C",
"uuid":"d82521b4-07ac-4f1c-8840-ddefedc332f3",
"type":"blank",
"blocks":"0"
},
"6":{
"8":{
"label":"OEM",
"fs_label":"OEM",
"type":"data",
Expand All @@ -56,17 +70,17 @@
"fs_compression":"zlib",
"mount":"/oem"
},
"7":{
"9":{
"label":"OEM-CONFIG",
"type":"flatcar-reserved",
"blocks":"131072"
},
"8":{
"10":{
"type":"blank",
"label":"flatcar-reserved",
"blocks":"0"
},
"9":{
"11":{
"label":"ROOT",
"fs_label":"ROOT",
"type":"dps-root",
Expand All @@ -76,28 +90,28 @@
}
},
"vm":{
"9":{
"11":{
"label":"ROOT",
"fs_label":"ROOT",
"blocks":"12943360"
}
},
"azure":{
"9":{
"11":{
"label":"ROOT",
"fs_label":"ROOT",
"blocks":"58875904"
}
},
"vagrant":{
"9":{
"11":{
"label":"ROOT",
"fs_label":"ROOT",
"blocks":"33845248"
}
},
"onmetal":{
"7":{
"9":{
"label":"config-2",
"fs_label":"config-2",
"type":"data",
Expand Down Expand Up @@ -130,11 +144,17 @@
"type":"blank"
},
"9":{
"type":"blank"
},
"10":{
"type":"blank"
},
"11":{
"label":"ROOT",
"fs_label":"ROOT",
"type":"0fc63daf-8483-4772-8e79-3d69d8477de4",
"blocks":"12582912"
}
}
}
}
}
53 changes: 53 additions & 0 deletions build_library/vm_image_util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,8 @@ install_oem_package() {
if [[ "${BOOTLOADER_MODE}" == "uki" ]]; then
install_uki_oem_addon
install_uki_timeout_addon
elif [[ "${BOOTLOADER_MODE}" == "grub" ]]; then
install_grub_timeout_override
fi
return 0
fi
Expand Down Expand Up @@ -602,6 +604,8 @@ install_oem_package() {
if [[ "${BOOTLOADER_MODE}" == "uki" ]]; then
install_uki_oem_addon
install_uki_timeout_addon
elif [[ "${BOOTLOADER_MODE}" == "grub" ]]; then
install_grub_timeout_override
fi
}

Expand Down Expand Up @@ -851,6 +855,55 @@ install_uki_timeout_addon() {
sudo rm -rf "${timeout_temp_dir}"
}

# Append systemd.default_device_timeout_sec=120 to grub.cfg's shared cmdline,
# scoped to the arm64 kola *test* image only (INJECT_DOCKER_SYSEXT=true).
#
# GRUB has no addon mechanism like UKI's .extra.d, so unlike
# install_uki_timeout_addon this patches the already-written grub.cfg copies
# on the ESP directly (both are plain text, no rebuild/re-signing needed) -
# same CI-only QEMU-TCG device-init timeout this exists to work around.
#
# Deliberately NOT applied to the production VM image (INJECT_DOCKER_SYSEXT=false)
# or to amd64: the failure is a CI-only TCG-emulation artefact that never occurs
# on real hardware.
install_grub_timeout_override() {
if [[ "${BOOTLOADER_MODE}" != "grub" ]]; then
return 0
fi

# Scope: arm64 test image only.
if [[ "${ARCH}" != "arm64" ]] || [[ "${INJECT_DOCKER_SYSEXT:-false}" != "true" ]]; then
return 0
fi

local esp_dir="${VM_TMP_ROOT}/boot"
local -a grub_cfgs=(
"${esp_dir}/EFI/boot/grub.cfg"
"${esp_dir}/boot/grub2/grub.cfg"
)

local found=0
for cfg in "${grub_cfgs[@]}"; do
if [[ ! -f "${cfg}" ]]; then
continue
fi
found=1
if sudo grep -q 'systemd.default_device_timeout_sec=' "${cfg}"; then
info "GRUB timeout override: ${cfg} already patched; skipping"
continue
fi
sudo sed -i 's/^set linux_cmdline="\(.*\)"$/set linux_cmdline="\1 systemd.default_device_timeout_sec=120"/' "${cfg}"
info "GRUB timeout override: patched ${cfg}"
done

if [[ "${found}" -eq 0 ]]; then
warn "GRUB timeout override: no grub.cfg found under ${esp_dir}; skipping"
return 0
fi

info "GRUB timeout override: cmdline += systemd.default_device_timeout_sec=120"
}

# Any other tweaks required?
run_fs_hook() {
local fs_hook=$(_get_vm_opt FS_HOOK)
Expand Down