FIX: EL 9.5 installation

This PR is aimed to fix the use of Enterprise Linux 9.5 Signed-off-by: Vinícius Ferrão <[email protected]>
xcat2 · Jan 8, 2025 · c6a364c · c6a364c
1 parent 6b8c669
commit c6a364c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -358,7 +358,7 @@ if($onlyinitrd){
 
     my $yumcmd = "yum $non_interactive -c /tmp/genimage.$$.yum.conf --installroot=$rootimg_dir/ --disablerepo=* ";
 
-    if ($osver =~ /^rhel\D*(\d*)[.\d]*.*$/) {
+    if ($osver =~ /^(?:rhel|rocky)\D*(\d*)[.\d]*.*$/) {
         $majorrel = $1;
         if ($majorrel > 7) {
             $yumcmd .= "--releasever=" . $majorrel . " ";

diff --git a/xCAT-server/share/xcat/scripts/setup-dockerhost-cert.sh b/xCAT-server/share/xcat/scripts/setup-dockerhost-cert.sh
@@ -60,7 +60,7 @@ if [ ! -e $XCATDOCKERCADIR/certs ]; then
 fi
 
 openssl genrsa -out ca/dockerhost-key.pem 2048
-openssl req -config ca/openssl.cnf -new -key ca/dockerhost-key.pem -out cert/dockerhost-req.pem -extensions server -subj "/CN=$CNA"
+openssl req -config ca/openssl.cnf -new -key ca/dockerhost-key.pem -out cert/dockerhost-req.pem -subj "/CN=$CNA"
 mv cert/dockerhost-req.pem  ca/$CNA\.csr
 cd -
 cd $XCATDOCKERCADIR

diff --git a/xCAT-server/share/xcat/scripts/setup-local-client.sh b/xCAT-server/share/xcat/scripts/setup-local-client.sh
@@ -70,9 +70,9 @@ mkdir -p $USERHOME/.xcat
 cd $USERHOME/.xcat
 openssl genrsa -out client-key.pem 2048
 if [ $FORCE -eq 0 ]; then
-  openssl req -config $XCATCADIR/openssl.cnf -new -key client-key.pem -out client-req.pem -extensions usr_cert -subj "/CN=$CNA"
+  openssl req -config $XCATCADIR/openssl.cnf -new -key client-key.pem -out client-req.pem -subj "/CN=$CNA"
 else
-  openssl req -config $XCATCADIR/openssl.cnf -new -key client-key.pem -out client-req.pem -extensions usr_cert -subj "/CN=$CNA" -batch
+  openssl req -config $XCATCADIR/openssl.cnf -new -key client-key.pem -out client-req.pem -subj "/CN=$CNA" -batch
 fi
 cp client-req.pem $XCATDIR/ca/root.csr
 cd - >/dev/null

diff --git a/xCAT-server/share/xcat/scripts/setup-server-cert.sh b/xCAT-server/share/xcat/scripts/setup-server-cert.sh
@@ -25,7 +25,7 @@ mkdir -p $XCATDIR/cert
 cd $XCATDIR/cert
 sed -i "s/#XCATCASAN#/DNS.1 = `hostname --long`\nDNS.2 = `hostname --short`/g" $XCATCADIR/openssl.cnf
 openssl genrsa -out server-key.pem 2048
-openssl req -config $XCATCADIR/openssl.cnf -new -key server-key.pem -out server-req.pem -extensions server -subj "/CN=$CNA"
+openssl req -config $XCATCADIR/openssl.cnf -new -key server-key.pem -out server-req.pem -subj "/CN=$CNA"
 cp server-req.pem  $XCATDIR/ca/`hostname`.csr
 cd -
 cd $XCATDIR/ca

diff --git a/xCAT-server/share/xcat/scripts/setup-xcat-ca.sh b/xCAT-server/share/xcat/scripts/setup-xcat-ca.sh
@@ -32,7 +32,7 @@ cp $XCATROOT/share/xcat/ca/Makefile $XCATCADIR/
 touch $XCATCADIR/index.attr
 cd $XCATCADIR
 make init
-#openssl req -nodes -config openssl.cnf -days 7300 -x509 -newkey rsa:2048 -out ca-cert.pem -extensions v3_ca -outform PEM -subj /CN="$CNA"
+#openssl req -nodes -config openssl.cnf -days 7300 -x509 -newkey rsa:2048 -out ca-cert.pem -outform PEM -subj /CN="$CNA"
 openssl genrsa -out private/ca-key.pem 2048
 chmod 600 private/ca-key.pem
 openssl req -new -key private/ca-key.pem -config openssl.cnf -out ca-req.csr -subj /CN="$CNA" -outform PEM