diff --git a/confluent_osdeploy/el8/profiles/default/initprofile.sh b/confluent_osdeploy/el8/profiles/default/initprofile.sh index 680ffda7..fa9c20ab 100644 --- a/confluent_osdeploy/el8/profiles/default/initprofile.sh +++ b/confluent_osdeploy/el8/profiles/default/initprofile.sh @@ -1,5 +1,8 @@ #!/bin/sh -sed -i 's/centos/CentOS/; s/rhel/Red Hat Enterprise Linux/; s/oraclelinux/Oracle Linux/; s/alma/AlmaLinux/' $2/profile.yaml +sed -i 's/centos/CentOS/; s/rhel/Red Hat Enterprise Linux/; s/oraclelinux/Oracle Linux/; s/alma/AlmaLinux/;s/fedora/Fedora Linux/' $2/profile.yaml +if grep Fedora $2/profile.yaml > /dev/null; then + sed -i 's/@^minimal-environment/#/' $2/packagelist +fi ln -s $1/images/pxeboot/vmlinuz $2/boot/kernel && \ ln -s $1/images/pxeboot/initrd.img $2/boot/initramfs/distribution mkdir -p $2/boot/efi/boot diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py index dcfdf6ec..595785e6 100644 --- a/confluent_server/confluent/osimage.py +++ b/confluent_server/confluent/osimage.py @@ -310,6 +310,27 @@ def check_rocky(isoinfo): arch = arch.decode('utf-8') return {'name': 'rocky-{0}-{1}'.format(ver, arch), 'method': EXTRACT, 'category': cat} +fedoracatmap = { + '41': 'el10', +} +def check_fedora(isoinfo): + if '.discinfo' not in isoinfo[1]: + return None + prodinfo = isoinfo[1]['.discinfo'] + prodlines = prodinfo.split(b'\n') + if len(prodlines) < 3: + return None + prod = prodlines[1].split()[0] + if prod != b'Fedora': + return None + arch = prodlines[2] + ver = prodlines[1].split()[-1] + if not isinstance(arch, str): + arch = arch.decode('utf-8') + ver = ver.decode('utf-8') + if ver not in fedoracatmap: + return None + return {'name': 'fedora-{0}-{1}'.format(ver, arch), 'method': EXTRACT, 'category': fedoracatmap[ver]} def check_alma(isoinfo): ver = None