From 864e10fdf1ad286301577797b85f8e20ad8e42a5 Mon Sep 17 00:00:00 2001
From: Michel Jouvin <jouvin@lal.in2p3.fr>
Date: Mon, 11 Nov 2024 19:18:43 +0100
Subject: [PATCH] aii-ks EL9 variant: add required packages

---
 aii-ks/src/main/pan/quattor/aii/ks/config.pan | 21 +++++++++++++------
 .../main/pan/quattor/aii/ks/variants/el9.pan  |  7 +++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/aii-ks/src/main/pan/quattor/aii/ks/config.pan b/aii-ks/src/main/pan/quattor/aii/ks/config.pan
index b0043eea..73abfd17 100644
--- a/aii-ks/src/main/pan/quattor/aii/ks/config.pan
+++ b/aii-ks/src/main/pan/quattor/aii/ks/config.pan
@@ -89,10 +89,12 @@ variable AII_ACK_PROTOCOL ?= AII_OSINSTALL_PROTOCOL;
 #
 variable AII_OSINSTALL_ROOT ?= undef;
 variable AII_OSINSTALL_OS_VERSION ?= undef;
-variable DEBUG = debug(format('%s: AII_OSINSTALL_ROOT=%s, AII_OSINSTALL_OS_VERSION=%s',
-                                OBJECT,
-                                AII_OSINSTALL_ROOT,
-                                AII_OSINSTALL_OS_VERSION));
+variable DEBUG = debug(
+    '%s: AII_OSINSTALL_ROOT=%s, AII_OSINSTALL_OS_VERSION=%s',
+    OBJECT,
+    AII_OSINSTALL_ROOT,
+    AII_OSINSTALL_OS_VERSION
+));
 
 # AII_OSINSTALL_SUBURL allows to specify a sub-url under root/version
 # (e.g. /base)
@@ -356,6 +358,11 @@ variable AII_OSINSTALL_OPTION_FIREWALL ?= null;
 # default list of packages required for the initial installation
 #
 
+variable AII_OSINSTALL_VERSIONLOCK_PLUGIN = if ( OS_VERSION_PARAMS['majorversion'] >= '8' ) {
+    "python3-dnf-plugin-versionlock";
+} else {
+    "yum-plugin-versionlock";
+};
 variable AII_OSINSTALL_PACKAGES ?= list(
     "curl",
     "lsof",
@@ -373,13 +380,15 @@ variable AII_OSINSTALL_PACKAGES ?= list(
     "perl-URI",
     "perl-XML-Parser",
     "yum-plugin-priorities",
-    "yum-plugin-versionlock",
+    AII_OSINSTALL_VERSIONLOCK_PLUGIN,
     "wget",
 );
 
 
-"packages" ?= AII_OSINSTALL_PACKAGES;
 "packages" = {
+    foreach (i; pkg_name; AII_OSINSTALL_PACKAGES) {
+        append(pkg_name);
+    };
     if (value('/system/aii/osinstall/ks/selinux') == 'disabled') {
         # grubby is used to disable selinux on with kernel parameter
         append('grubby');
diff --git a/aii-ks/src/main/pan/quattor/aii/ks/variants/el9.pan b/aii-ks/src/main/pan/quattor/aii/ks/variants/el9.pan
index 6d862cd6..6e33ac22 100644
--- a/aii-ks/src/main/pan/quattor/aii/ks/variants/el9.pan
+++ b/aii-ks/src/main/pan/quattor/aii/ks/variants/el9.pan
@@ -8,6 +8,13 @@ prefix "/system/aii/osinstall/ks";
 "langsupport" = null;
 "packages_args" = list("--ignoremissing");
 
+# Required by perl-CDB_File
+"packages" = append("perl-English");
+# Required by some Quattor components and must be installed before
+# /etc/init.d is created by something else (e.g. a Quattor package)
+"packages" = append("chkconfig");
+"packages" = append("initscripts");
+
 "part_label" = true;
 "volgroup_required" = false;
 "lvmforce" = true;