mirror of
https://github.com/xcat2/confluent.git
synced 2026-09-28 16:20:54 +00:00
Fixes for ARM genesis
Do not autocons if we have ttyAMA0 Make sure to use the proper architecture for addons.
This commit is contained in:
@@ -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%,*}
|
||||
|
||||
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user