Merge pull request #1163 from c-po/serial-fixes

image: T8375: honor already existing boot_settings

Author: c-po

Makefile

@@ -15,7 +15,7 @@ all:
 .PHONY: checkiso
 .ONESHELL:
 checkiso:
-	if [ ! -f $(ISO_PATH) ]; then
+	if [[ ! -f $(ISO_PATH) ]]; then
 		echo "Could not find $(ISO_PATH)"
 		exit 1
 	fi
@@ -73,7 +73,7 @@ testtpm: checkiso
 .PHONY: test-ci-qcow2
 .ONESHELL:
 test-ci-qcow2:
-	if [ ! -f build/*.qcow2 ]; then
+	if [[ ! -n $$(ls -t build/*.qcow2 | head -n 1) ]]; then
 		echo "Could not find any QCOW2 disk image"
 		exit 1
 	fi

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"

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"

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()]

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}}" \