Merge branch 'current' into T8542-SBOM-current

5 files changed, 58 insertions, 7 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/data/certificates/vyos-prod-2025-linux.pem b/data/certificates/vyos-prod-2025-linux.pem
new file mode 100644
index 00000000..0bbbfd30
--- /dev/null
+++ b/data/certificates/vyos-prod-2025-linux.pem
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE5jCCAs4CFGylfirdM1ur0I2mm0jHBpPt0rA3MA0GCSqGSIb3DQEBCwUAMCcx
+JTAjBgNVBAMMHFZ5T1MgTmV0d29ya3MgU2VjdXJlIEJvb3QgQ0EwHhcNMjUwNDI2
+MDkwNzA2WhcNMzUwNDI0MDkwNzA2WjA4MTYwNAYDVQQDDC1WeU9TIE5ldHdvcmtz
+IFNlY3VyZSBCb290IFNpZ25lciAyMDI1IC0gbGludXgwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDgsT5x8fUsgCq+FvQlD5+dtcUXnsx+psrbvlX8vaIa
+62W2X6+ifPeZmtwGQ2LbVll2/mg2X/Xj4BTjBeiJ+6MDxCjpjALk/15qwaySX4az
+AxDOJed/KT5wiw1xyuyvG89Q0PmC+/WDnLd5A8z8C7hJ46obgSS1W6U2XHbA9rVC
+3wCucLN5scbz5iQMb1n23eLCDZ2vLeyuXmaWOJGYcE70A4p01HIEJ1veUBdrdHcx
+9Lsp8GE29BMauuBjKV3lW4ifB5SaHwr40G1X4Tk1f2ZSlSc3e60iXXkDaDsGB6om
+gsLO/C6PZAi7cxseRDTdM8dS7V7AbbHcXzQ7eWUVknL7e7qe9Syoa7P3N0q2HFCR
+zpfSc9FrZKCGqbNnx7pB4RPExkEy+EGBxsHNHe023VEs1NFghnx9a83Ti2HeAt0W
+7Zcf/66JYEMsJBgqCEAeVKfwTc+/eo7fxw9ga+U2jQA0tBExZ/GHOuIBNx4wJ7++
+BlFBmDzRXF0phjGtkQ9YtCmZoBb87UuDAibTj7gfjNJxzMSxRLbqQDkyab2Jl9R+
+1DHLDn4owp/8LgBckq21KNk/uYpv3smRlF7L07gQl50LieuSsnEBKYRCzofxMDt5
+TH3FpZzze7qxK1zcJQyhK/N8AQJMFL3EyEcRXr9NB1meoDaelSNR8NVBoNzLpHOk
+NQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQBTdqwHSD7sVe/RukUPPQ60wHk8XQpq
+fwuZwCeGwKAFjVhR3WE61DXKH7AiHN6bHDbSbetPEjJ+gJNi5Ozd91/zZY7uM5cZ
+V6M7UGprP5Ou36e8PbObZ8hCAog1Ss7syWCJ2y8vFuH+WJeVxMcEweoniPpRcmVi
+BYeY1DnpWMhO2SgMOEb5RoiisNyTd9xR+WY1YNB+/7OXtLwJUCnmxlsZHFT9fI8J
+F/awm24PcUGUn43nzTCwmXp+mIKLurVvs3tZonFQ7zMvFlId11G0xB4rb+pYl/3O
+lOinplf/+jwSwc0jb6g99QNN/vQpq6b3CkGS3zdIeF7s/q1G0IRYHTqrou8avugT
+95cZxqhncXPY7PFst/lblJsj095UxlqLLKZ35+TqyTXTHDw9/SrbTabkSdHPitmd
+YMB5xu8RkA6g/oMJdCMDG+bDjgdx+gDcce9Lg8HFjdHkpfRxpgEUremeW9nPuIru
+eFp5fEGdp+I95ryXcgm8pYY9o+VmGgCgplP8UYu4miRoeGluLp+bq5eM+cwxzh00
+ExCpffkZV7HDid6NEZ4HH9PFQxoikc3BmsPAY3IifUG0cNU3qjLWvPxk09ZXeqIB
+8SdrC+euQXdVL/jHeF+53+ZJOLL+rfFGBFaDUOeRGhtTEc80pPzWJZhuIaOVuk1J
+mYEC+/oplzyF4g==
+-----END CERTIFICATE-----
diff --git a/data/defaults.toml b/data/defaults.toml
index eefeeb2f..fb51f3cc 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "https://packages.vyos.net/repositories/current"
 vyos_branch = "current"
 release_train = "current"
 
-kernel_version = "6.6.135"
+kernel_version = "6.18.26"
 kernel_flavor = "vyos"
 bootloaders = "syslinux,grub-efi"
 
diff --git a/data/live-build-config/hooks/live/95-serial.chroot b/data/live-build-config/hooks/live/95-serial.chroot
new file mode 100644
index 00000000..1bcaa963
--- /dev/null
+++ b/data/live-build-config/hooks/live/95-serial.chroot
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# We do have different default console configurations per flavor used. We will
+# set the serial console to the default configuration for the flavor.
+WRITE_CONFIG="/usr/libexec/vyos/write-config-file-value.py"
+if ! test -x $WRITE_CONFIG; then
+    echo "E: missing script to implant serial config settings"
+    exit 1
+fi
+
+default_config_file=$(python3 -c 'from vyos.defaults import config_default; print(config_default)')
+device=$(jq -r '"\(.console_type)\(.console_num)"' /usr/share/vyos/flavor.json)
+speed=$(jq -r '.console_speed' /usr/share/vyos/flavor.json)
+
+if [ -n "$device" ] && [ -n "$speed" ] && [ -f $default_config_file ]; then
+    $WRITE_CONFIG --path "system console device $device speed" \
+        --value "$speed" \
+        --config-file $default_config_file
+    $WRITE_CONFIG --path "system console device $device kernel" \
+        --config-file $default_config_file
+else
+    echo "E: Could not implant serial console settings in: $default_config_file"
+    exit 1
+fi