diff options
| -rw-r--r-- | data/architectures/amd64.toml | 5 | ||||
| -rw-r--r-- | data/architectures/arm64.toml | 5 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 11 |
3 files changed, 10 insertions, 11 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 4a864d7c..09a9de93 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -12,6 +12,5 @@ packages = [ "amd64-microcode" ] -console_type = "ttyS" -console_num = "0" -console_speed = "115200" +[boot_settings] + console_type = "ttyS" diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index 452e3e1e..1aa67021 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -6,6 +6,5 @@ packages = [ bootloaders = "grub-efi" squashfs_compression_type = "xz -b 256k -always-use-fragments -no-recovery" -console_type = "ttyAMA" -console_num = "0" -console_speed = "115200" +[boot_settings] + console_type = "ttyAMA" 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}}" \ |