diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-04-21 19:03:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-21 19:03:58 +0000 |
| commit | 8d13ffae3898c4b28d56fbfbf6c0b3afc137daac (patch) | |
| tree | 29fb4cb950af5f53b88d75c6b6447abe9c9d7769 /scripts | |
| parent | 018e4ddcfc0551ba999a37cfbaae1a08bb12e271 (diff) | |
| parent | 8c97d461d1c5bfef77b3ebf46ea1d1e211dbd556 (diff) | |
| download | vyos-build-8d13ffae3898c4b28d56fbfbf6c0b3afc137daac.tar.gz vyos-build-8d13ffae3898c4b28d56fbfbf6c0b3afc137daac.zip | |
Merge pull request #1163 from c-po/serial-fixes
image: T8375: honor already existing boot_settings
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 5 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 9a9b6042..a938c3e9 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -542,6 +542,11 @@ def basic_cli_tests(c): lines = [l.strip() for l in c.before.splitlines() if l.strip()] console_type = lines[-1].decode('utf-8').strip() # e.g. ttyS + # We do only care for ttyS or ttyAMA console types, exit early + # for VGA consoles + if console_type == 'tty': + return + c.sendline('cat /usr/share/vyos/flavor.json | jq -r ".console_num"') c.expect(op_mode_prompt) lines = [l.strip() for l in c.before.splitlines() if l.strip()] diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index ee7905b4..11537de0 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -440,9 +440,10 @@ def build(): build_config['version'] = version flavor_data = { - 'console_type': build_config["console_type"], - 'console_num': build_config["console_num"], - 'console_speed': build_config["console_speed"] + 'flavor': build_config["build_flavor"], + 'console_type': build_config["boot_settings"]["console_type"], + 'console_num': build_config["boot_settings"]["console_num"], + 'console_speed': build_config["boot_settings"]["console_speed"] } version_data = { @@ -639,8 +640,8 @@ DOCUMENTATION_URL="{build_config['documentation_url']}" --archive-areas "{{debian_archive_areas}}" \ --backports true \ --binary-image iso-hybrid \ - --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console="{{console_type}}{{console_num}},{{console_speed}}" console=tty0 net.ifnames=0 biosdevname=0" \ - --bootappend-live-failsafe "live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal console="{{console_type}}{{console_num}},{{console_speed}}" console=tty0 net.ifnames=0 biosdevname=0" \ + --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console="{{boot_settings.console_type}}{{boot_settings.console_num}},{{boot_settings.console_speed}}" console=tty0 net.ifnames=0 biosdevname=0" \ + --bootappend-live-failsafe "live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal console="{{boot_settings.console_type}}{{boot_settings.console_num}},{{boot_settings.console_speed}}" console=tty0 net.ifnames=0 biosdevname=0" \ --bootloaders "{{bootloaders}}" \ --checksums "sha256" \ --chroot-squashfs-compression-type "{{squashfs_compression_type}}" \ |