From 69b0b8462ff0c34c3f4063dc738a9098f7cf5700 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 23 Sep 2026 10:41:28 -0400 Subject: [PATCH] Fixes for ARM genesis Do not autocons if we have ttyAMA0 Make sure to use the proper architecture for addons. --- .../genesis/initramfs/opt/confluent/bin/rungenesis | 2 +- confluent_server/bin/osdeploy | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis b/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis index 051cff15..013bbb43 100644 --- a/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis +++ b/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis @@ -34,7 +34,7 @@ set_tpm_hashalgo() { } mkdir -p /etc/confluent -if ! grep console= /proc/cmdline >& /dev/null; then +if ! grep console= /proc/cmdline >& /dev/null && ! [ -e /dev/ttyAMA0 ] ; then autocons=$(/opt/confluent/bin/autocons) echo console=$autocons |sed -e 's!/dev/!!' >> /tmp/01-autocons.conf autocons=${autocons%,*} diff --git a/confluent_server/bin/osdeploy b/confluent_server/bin/osdeploy index e5ec1020..033ba7dd 100644 --- a/confluent_server/bin/osdeploy +++ b/confluent_server/bin/osdeploy @@ -135,7 +135,10 @@ def initialize_genesis(arch='x86_64'): f'/var/lib/confluent/public/os/genesis-{arch}/boot/initramfs/distribution') symlinkp('/var/lib/confluent/public/site/initramfs.cpio', f'/var/lib/confluent/public/os/genesis-{arch}/boot/initramfs/site.cpio') - symlinkp('/opt/confluent/lib/osdeploy/genesis/initramfs/addons.cpio', + addons = '/opt/confluent/lib/osdeploy/genesis/initramfs/addons.cpio' + if os.path.exists(f'/opt/confluent/lib/osdeploy/genesis/initramfs/{arch}/addons.cpio'): + addons = f'/opt/confluent/lib/osdeploy/genesis/initramfs/{arch}/addons.cpio' + symlinkp(addons, f'/var/lib/confluent/public/os/genesis-{arch}/boot/initramfs/addons.cpio') symlinkp(f'/opt/confluent/genesis/{arch}/boot/kernel', f'/var/lib/confluent/public/os/genesis-{arch}/boot/kernel')