Skip to content

image: T8375: honor already existing boot_settings#1163

Open
c-po wants to merge 3 commits intovyos:currentfrom
c-po:serial-fixes
Open

image: T8375: honor already existing boot_settings#1163
c-po wants to merge 3 commits intovyos:currentfrom
c-po:serial-fixes

Conversation

@c-po
Copy link
Copy Markdown
Member

@c-po c-po commented Apr 20, 2026

Change summary

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.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

How to test / Smoketest result

Smoketests

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

c-po added 3 commits April 20, 2026 21:02
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.
Copilot AI review requested due to automatic review settings April 20, 2026 19:10
@c-po c-po added the bp/circinus Create automatic backport for circinus label Apr 20, 2026
@c-po c-po self-assigned this Apr 20, 2026
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 20, 2026

👍
No issues in PR Title / Commit Title

@github-actions github-actions bot added the current VyOS rolling release label Apr 20, 2026
@c-po c-po requested review from asklymenko and jestabro April 20, 2026 19:12
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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-image to read console parameters from build_config["boot_settings"] and pass them into generated metadata / live-build args.
  • Convert amd64.toml and arm64.toml console 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/*.qcow2 command substitution will emit an ls: 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 parsing ls output 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.

@github-actions
Copy link
Copy Markdown

CI integration ❌ failed!

Details

CI logs

  • Config tests ❌ failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bp/circinus Create automatic backport for circinus current VyOS rolling release

Development

Successfully merging this pull request may close these issues.

2 participants