From 36ce0922fcca1e9cf14a40af1754c292d34c13a0 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 6 Aug 2025 14:56:12 -0400 Subject: [PATCH] Implement openEuler scripted install openEuler 24.03 seems closest to el8, so start with that baseline. Modify el8 handling to recognize a totally missing CA bundle and assume the original el8 location. Have osimage recognize openEuler media by presence of openEuler release file. --- .../usr/lib/dracut/hooks/cmdline/01-confluent.sh | 8 +++++--- confluent_server/confluent/osimage.py | 10 ++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh index 84882ba4..09ab1212 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/cmdline/01-confluent.sh @@ -3,10 +3,12 @@ echo -n "" >> /tmp/net.ifaces echo -n "" > /tmp/01-autocons.devnode BUNDLENAME=/etc/pki/tls/certs/ca-bundle.crt if [ ! -e "$BUNDLENAME" ]; then - BUNDLENAME=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem mkdir -p /etc/pki/tls/certs - ln -s $BUNDLENAME /etc/pki/tls/certs/ca-bundle.crt -fi + if [ -e /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ]; then + BUNDLENAME=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + ln -s $BUNDLENAME /etc/pki/tls/certs/ca-bundle.crt + fi +fi cat /tls/*.0 >> $BUNDLENAME if ! grep console= /proc/cmdline >& /dev/null; then autocons=$(/opt/confluent/bin/autocons) diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py index d92edd94..8a3c2fb5 100644 --- a/confluent_server/confluent/osimage.py +++ b/confluent_server/confluent/osimage.py @@ -318,6 +318,16 @@ def extract_file(archfile, flags=0, callback=lambda x: None, imginfo=(), extract return pctdone +def check_openeuler(isoinfo): + for entry in isoinfo[0]: + if 'openEuler-release-24.03' in entry: + ver = entry.split('-')[2] + arch = entry.split('.')[-2] + cat = 'el9' + break + else: + return None + return {'name': 'openeuler-{0}-{1}'.format(ver, arch), 'method': EXTRACT, 'category': cat} def check_rocky(isoinfo): ver = None arch = None