From 5cffad221ca25c86abf1f9d2630a850c80279154 Mon Sep 17 00:00:00 2001 From: Elkhan Mammadli Date: Wed, 18 May 2022 15:30:12 +0400 Subject: [PATCH] F #267: Add EL9 support Since EL9 does not contain the legacy network scripts, add EL9 support without network-scripts dependency Signed-off-by: Elkhan Mammadli --- README.md | 3 ++- generate-all.sh | 2 +- targets.sh | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f9ecbd9..927d65e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ List of tested platforms only: | Platform | Versions | |---------------------------------|------------------------------------------| -| AlmaLinux | 8 | +| AlmaLinux | 8, 9 | | Alpine Linux | 3.13, 3.14, 3.15 | | Amazon Linux | 2 | | CentOS | 7, 8 Stream | @@ -87,6 +87,7 @@ Selectable configuration types and IP configuration methods are **supported only | openSUSE 15 | `scripts` | | RHEL-like 7 (CentOS, Oracle Linux) | `scripts` | | RHEL-like 8 (CentOS, Oracle/Rocky/AlmaLinux) | `scripts`, `nm`, `networkd` | +| RHEL-like 9 (CentOS Stream 9, Oracle/Rocky/AlmaLinux) | `nm`, `networkd` | | Ubuntu 18.04, 20.04, 21.10, 22.04 | `interfaces`, `netplan`, `nm`, `networkd` | (other than listed platforms are not supported for using `NETCFG_TYPE` nor `METHOD`/`IP6_METHOD`!): diff --git a/generate-all.sh b/generate-all.sh index 8cfb3e7..d705862 100755 --- a/generate-all.sh +++ b/generate-all.sh @@ -3,7 +3,7 @@ set -e export DATE=$(date +%Y%m%d) -TARGETS='el6 el7 el8 alt suse deb alpine freebsd iso' +TARGETS='el6 el7 el8 el9 alt suse deb alpine freebsd iso' for TARGET in $TARGETS; do TARGET="${TARGET}" ./generate.sh diff --git a/targets.sh b/targets.sh index 38589ed..bd42cc7 100644 --- a/targets.sh +++ b/targets.sh @@ -80,6 +80,22 @@ case "${TARGET}" in POSTUP=${POSTUP:-pkg/postupgrade} ;; + 'el9') + NAME=${NAME:-one-context} + RELSUFFIX=${RELSUFFIX:-.el9} + TYPE=${TYPE:-rpm} + TAGS=${TAGS:-linux rpm systemd one} + DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server qemu-guest-agent gawk virt-what} + RECOMMENDS=${RECOMMENDS:-open-vm-tools} + PROVIDES=${PROVIDES:-} + REPLACES=${REPLACES:-cloud-init} + CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} + POSTIN=${POSTINST:-pkg/postinstall} + PREUN=${PREUN:-pkg/preuninstall} + POSTUN=${POSTUN:-pkg/postuninstall} + POSTUP=${POSTUP:-pkg/postupgrade} + ;; + 'alt') NAME=${NAME:-one-context} RELSUFFIX=${RELSUFFIX:-alt}