From 2e7b332b77e0935cc174930eee692ce18327de0e Mon Sep 17 00:00:00 2001 From: Romain Dartigues Date: Sun, 17 Mar 2024 18:07:29 +0100 Subject: [PATCH] introduce AlmaLinux AlmaLinux is an Open Source fork of Red Hat Enterprise Linux; it should behave like a CentOS/RHEL. --- cdist/conf/explorer/os | 6 ++++++ cdist/conf/explorer/os_version | 2 +- cdist/conf/type/__package/manifest | 2 +- cdist/conf/type/__package_yum/gencode-remote | 2 +- cdist/conf/type/__yum_repo/manifest | 2 +- docs/src/cdist-os.rst | 1 + 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cdist/conf/explorer/os b/cdist/conf/explorer/os index b9232ee4..50db7603 100755 --- a/cdist/conf/explorer/os +++ b/cdist/conf/explorer/os @@ -80,6 +80,12 @@ if [ -f /etc/owl-release ]; then fi ### Redhat and derivatives +if grep -q ^AlmaLinux /etc/redhat-release 2>/dev/null +then + echo almalinux + exit 0 +fi + if grep -q ^Scientific /etc/redhat-release 2>/dev/null; then echo scientific exit 0 diff --git a/cdist/conf/explorer/os_version b/cdist/conf/explorer/os_version index fc59fd14..b78dfae6 100755 --- a/cdist/conf/explorer/os_version +++ b/cdist/conf/explorer/os_version @@ -125,7 +125,7 @@ in owl) cat /etc/owl-release ;; - redhat|centos|mitel|scientific) + almalinux|redhat|centos|mitel|scientific) cat /etc/redhat-release ;; slackware) diff --git a/cdist/conf/type/__package/manifest b/cdist/conf/type/__package/manifest index a453c32b..dd7ecd0c 100755 --- a/cdist/conf/type/__package/manifest +++ b/cdist/conf/type/__package/manifest @@ -31,7 +31,7 @@ else # By default determine package manager based on operating system os="$(cat "$__global/explorer/os")" case "$os" in - amazon|scientific|centos|fedora|redhat) type="yum" ;; + almalinux|amazon|scientific|centos|fedora|redhat) type="yum" ;; archlinux) type="pacman" ;; debian|ubuntu|devuan) type="apt" ;; freebsd) diff --git a/cdist/conf/type/__package_yum/gencode-remote b/cdist/conf/type/__package_yum/gencode-remote index b52953f6..25d4260e 100755 --- a/cdist/conf/type/__package_yum/gencode-remote +++ b/cdist/conf/type/__package_yum/gencode-remote @@ -37,7 +37,7 @@ fi state_should="$(cat "$__object/parameter/state")" -if grep -q -E "(scientific|centos|redhat|amazon)" "$__global/explorer/os"; then +if grep -q -E "(almalinux|scientific|centos|redhat|amazon)" "$__global/explorer/os"; then opts="-y --quiet" else opts="--assumeyes --quiet" diff --git a/cdist/conf/type/__yum_repo/manifest b/cdist/conf/type/__yum_repo/manifest index 5f60d32c..b1f07aff 100755 --- a/cdist/conf/type/__yum_repo/manifest +++ b/cdist/conf/type/__yum_repo/manifest @@ -22,7 +22,7 @@ os=$(cat "$__global/explorer/os") state="$(cat "$__object/parameter/state")" case "$os" in - scientific|centos) + almalinux|scientific|centos) repo_name="$__object_id" export repo_name repo_file="/etc/yum.repos.d/${repo_name}.repo" diff --git a/docs/src/cdist-os.rst b/docs/src/cdist-os.rst index a8e31226..a331ea66 100644 --- a/docs/src/cdist-os.rst +++ b/docs/src/cdist-os.rst @@ -3,6 +3,7 @@ Supported operating systems cdist was tested or is know to run on at least +* `Alma Linux `_ * `Alpine Linux `_ * `Archlinux `_ * `CentOS `_