image: T8375: honor already existing boot_settings#1163
Open
c-po wants to merge 3 commits intovyos:currentfrom
Open
image: T8375: honor already existing boot_settings#1163c-po wants to merge 3 commits intovyos:currentfrom
c-po wants to merge 3 commits intovyos:currentfrom
Conversation
VyOS flavors might come with boot_settings which already provided additional serial interface settings if required. Instead of using our own definitions, re-use what's already existing. scripts/image-build/build-vyos-image comes with an implicit default for boot_settings like console number and speed, thus we do not need to redefine the existing default - again.
… console It does not make sense to test the serial console autodeteaction on a flavor which uses a VGA console like PROXMOX. If console_type is a VGA console, bail out early from the tests.
|
👍 |
There was a problem hiding this comment.
Pull request overview
Updates the image build pipeline to rely on boot_settings (with script-provided defaults) rather than redefining console settings per-architecture, ensuring existing flavor-provided boot settings are honored.
Changes:
- Switch
build-vyos-imageto read console parameters frombuild_config["boot_settings"]and pass them into generated metadata / live-build args. - Convert
amd64.tomlandarm64.tomlconsole settings to a[boot_settings]table (relying on defaults for unspecified fields). - Adjust QEMU install smoketest to skip serial-console assertions for VGA console images; refine Makefile checks for ISO/QCOW2 presence.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| scripts/image-build/build-vyos-image | Uses boot_settings for console info in flavor.json and live-build boot append parameters. |
| scripts/check-qemu-install | Skips serial-console validation when flavor console type indicates VGA. |
| data/architectures/arm64.toml | Moves console configuration under [boot_settings] (console type only). |
| data/architectures/amd64.toml | Moves console configuration under [boot_settings] (console type only). |
| Makefile | Updates ISO existence check and changes QCOW2 discovery logic for CI target. |
Comments suppressed due to low confidence (1)
Makefile:80
- The
ls -t build/*.qcow2command substitution will emit anls: cannot access ...error to stderr when no files match, before printing your friendly error message. Consider capturing the latest qcow2 path with stderr suppressed and checking it with[[ -z ... ]](also avoids parsinglsoutput twice).
if [[ ! -n $$(ls -t build/*.qcow2 | head -n 1) ]]; then
echo "Could not find any QCOW2 disk image"
exit 1
fi
rm -f cloud-init-image-$(ARCH).qcow2 ; cp $$(ls -t build/*.qcow2 | head -n 1) cloud-init-image-$(ARCH).qcow2
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
CI integration ❌ failed! Details
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change summary
VyOS flavors might come with
boot_settingswhich already provided additional serial interface settings if required. Instead of using our own definitions, re-use what's already existing.scripts/image-build/build-vyos-imagecomes with an implicit default forboot_settingslike console number and speed, thus we do not need to redefine the existing default - again.Types of changes
Related Task(s)
Related PR(s)
How to test / Smoketest result
Smoketests
Checklist: