From 114772624217c309b473bbaaccf7770cea841122 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Tue, 31 Aug 2021 15:54:43 -0400 Subject: [PATCH 1/2] Support CentOS8 Stream --- xCAT-server/lib/xcat/plugins/anaconda.pm | 2 ++ .../share/xcat/install/centos/compute.centos-stream8.pkglist | 1 + .../share/xcat/install/centos/compute.centos-stream8.tmpl | 1 + .../xcat/netboot/centos/compute.centos-stream8.ppc64le.exlist | 1 + .../xcat/netboot/centos/compute.centos-stream8.ppc64le.pkglist | 1 + .../netboot/centos/compute.centos-stream8.ppc64le.postinstall | 1 + .../xcat/netboot/centos/compute.centos-stream8.x86_64.exlist | 1 + .../xcat/netboot/centos/compute.centos-stream8.x86_64.pkglist | 1 + .../netboot/centos/compute.centos-stream8.x86_64.postinstall | 1 + xCAT-server/xCAT-server.spec | 3 +++ 10 files changed, 13 insertions(+) create mode 120000 xCAT-server/share/xcat/install/centos/compute.centos-stream8.pkglist create mode 120000 xCAT-server/share/xcat/install/centos/compute.centos-stream8.tmpl create mode 120000 xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.exlist create mode 120000 xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.pkglist create mode 120000 xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.postinstall create mode 120000 xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.exlist create mode 120000 xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.pkglist create mode 120000 xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.postinstall diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 6dfa247ce..87f644d8e 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -2066,6 +2066,8 @@ sub copycd } } elsif ($desc and $desc =~ /CentOS Linux (.*)/) { $distname = "centos" . $1; + } elsif ($desc and $desc =~ /CentOS Stream (.*)/) { + $distname = "centos-stream" . $1; } elsif ($desc and $desc =~ /Rocky Linux (.*)/) { $distname = "rocky" . $1; } diff --git a/xCAT-server/share/xcat/install/centos/compute.centos-stream8.pkglist b/xCAT-server/share/xcat/install/centos/compute.centos-stream8.pkglist new file mode 120000 index 000000000..29bbb3572 --- /dev/null +++ b/xCAT-server/share/xcat/install/centos/compute.centos-stream8.pkglist @@ -0,0 +1 @@ +compute.centos8.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/centos/compute.centos-stream8.tmpl b/xCAT-server/share/xcat/install/centos/compute.centos-stream8.tmpl new file mode 120000 index 000000000..f2dfcbd97 --- /dev/null +++ b/xCAT-server/share/xcat/install/centos/compute.centos-stream8.tmpl @@ -0,0 +1 @@ +compute.centos8.tmpl \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.exlist b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.exlist new file mode 120000 index 000000000..f468ba7e1 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.exlist @@ -0,0 +1 @@ +../rh/compute.rhels8.ppc64le.exlist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.pkglist new file mode 120000 index 000000000..38195cc33 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.pkglist @@ -0,0 +1 @@ +../rh/compute.rhels8.ppc64le.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.postinstall b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.postinstall new file mode 120000 index 000000000..011158f7b --- /dev/null +++ b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.ppc64le.postinstall @@ -0,0 +1 @@ +../rh/compute.rhels8.ppc64le.postinstall \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.exlist b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.exlist new file mode 120000 index 000000000..a6d9c0135 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.exlist @@ -0,0 +1 @@ +../rh/compute.rhels8.x86_64.exlist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.pkglist b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.pkglist new file mode 120000 index 000000000..5ecd4c4d1 --- /dev/null +++ b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.pkglist @@ -0,0 +1 @@ +../rh/compute.rhels8.x86_64.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.postinstall b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.postinstall new file mode 120000 index 000000000..3e16d254e --- /dev/null +++ b/xCAT-server/share/xcat/netboot/centos/compute.centos-stream8.x86_64.postinstall @@ -0,0 +1 @@ +../rh/compute.rhels8.x86_64.postinstall \ No newline at end of file diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index d64726ab8..07579bbba 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -443,6 +443,9 @@ fi ln -sf $RPM_INSTALL_PREFIX0/sbin/xcatd /usr/sbin/xcatd ln -sf $RPM_INSTALL_PREFIX0/share/xcat/install/sles $RPM_INSTALL_PREFIX0/share/xcat/install/sle ln -sf $RPM_INSTALL_PREFIX0/share/xcat/netboot/sles $RPM_INSTALL_PREFIX0/share/xcat/netboot/sle + +ln -sf $RPM_INSTALL_PREFIX0/share/xcat/install/centos $RPM_INSTALL_PREFIX0/share/xcat/install/centos-stream +ln -sf $RPM_INSTALL_PREFIX0/share/xcat/netboot/centos $RPM_INSTALL_PREFIX0/share/xcat/netboot/centos-stream if [ "$1" = "1" ]; then #Only if installing for the first time.. if [ -x /usr/lib/systemd/systemd ]; then /usr/bin/systemctl daemon-reload From 77e74f820c1574b888ba41198dfed0eaa3457d68 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Wed, 1 Sep 2021 10:20:06 -0400 Subject: [PATCH 2/2] Add service node links --- .../share/xcat/install/centos/service.centos-stream8.pkglist | 1 + .../centos/service.centos-stream8.ppc64le.otherpkgs.pkglist | 1 + .../share/xcat/install/centos/service.centos-stream8.tmpl | 1 + .../centos/service.centos-stream8.x86_64.otherpkgs.pkglist | 1 + 4 files changed, 4 insertions(+) create mode 120000 xCAT-server/share/xcat/install/centos/service.centos-stream8.pkglist create mode 120000 xCAT-server/share/xcat/install/centos/service.centos-stream8.ppc64le.otherpkgs.pkglist create mode 120000 xCAT-server/share/xcat/install/centos/service.centos-stream8.tmpl create mode 120000 xCAT-server/share/xcat/install/centos/service.centos-stream8.x86_64.otherpkgs.pkglist diff --git a/xCAT-server/share/xcat/install/centos/service.centos-stream8.pkglist b/xCAT-server/share/xcat/install/centos/service.centos-stream8.pkglist new file mode 120000 index 000000000..818f670ec --- /dev/null +++ b/xCAT-server/share/xcat/install/centos/service.centos-stream8.pkglist @@ -0,0 +1 @@ +../rh/service.rhels8.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/centos/service.centos-stream8.ppc64le.otherpkgs.pkglist b/xCAT-server/share/xcat/install/centos/service.centos-stream8.ppc64le.otherpkgs.pkglist new file mode 120000 index 000000000..ed90f050f --- /dev/null +++ b/xCAT-server/share/xcat/install/centos/service.centos-stream8.ppc64le.otherpkgs.pkglist @@ -0,0 +1 @@ +../rh/service.rhels8.ppc64le.otherpkgs.pkglist \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/centos/service.centos-stream8.tmpl b/xCAT-server/share/xcat/install/centos/service.centos-stream8.tmpl new file mode 120000 index 000000000..1659438f5 --- /dev/null +++ b/xCAT-server/share/xcat/install/centos/service.centos-stream8.tmpl @@ -0,0 +1 @@ +compute.centos-stream8.tmpl \ No newline at end of file diff --git a/xCAT-server/share/xcat/install/centos/service.centos-stream8.x86_64.otherpkgs.pkglist b/xCAT-server/share/xcat/install/centos/service.centos-stream8.x86_64.otherpkgs.pkglist new file mode 120000 index 000000000..03999f75f --- /dev/null +++ b/xCAT-server/share/xcat/install/centos/service.centos-stream8.x86_64.otherpkgs.pkglist @@ -0,0 +1 @@ +../rh/service.rhels8.x86_64.otherpkgs.pkglist \ No newline at end of file