From 258f7cfd3c38275a7ac312e5312e3b0f9578318a Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Wed, 18 Mar 2020 16:36:02 -0400
Subject: [PATCH 1/3] add more package to diskless package list for rhels8.1

---
 .../netboot/rh/compute.rhels8.ppc64le.pkglist | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.pkglist
index 3777e6445..ae709f861 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.pkglist
@@ -1,9 +1,17 @@
 @minimal-environment
+bash
+openssl
+dhclient
+openssh-server
+openssh-clients
 chrony
+vim-minimal
+ntp
+rpm
+iputils
 kernel
 net-tools
 nfs-utils
-openssh-server
 rsync
 tar
 util-linux
@@ -11,4 +19,15 @@ wget
 python3
 tar
 bzip2
+gzip
+grub2
+grub2-tools
 bc
+dracut
+dracut-network
+hostname
+parted
+e2fsprogs
+ethtool
+rsyslog
+lsvpd

From e7f4d72873a06cd92f600a8044485d6ceb57a456 Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Thu, 19 Mar 2020 16:06:10 -0400
Subject: [PATCH 2/3] Add more package for x86_64 and service pkglist

---
 .../xcat/netboot/rh/compute.rhels8.x86_64.pkglist | 15 +++++++++++++++
 .../netboot/rh/service.rhels8.ppc64le.pkglist     | 15 +++++++++++++++
 .../xcat/netboot/rh/service.rhels8.x86_64.pkglist | 15 +++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.x86_64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.x86_64.pkglist
index 3777e6445..cbeb2b5ab 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.x86_64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.x86_64.pkglist
@@ -12,3 +12,18 @@ python3
 tar
 bzip2
 bc
+dracut
+dracut-network
+rsyslog
+hostname
+e2fsprogs
+ethtool
+parted
+openssl
+dhclient
+openssh-clients
+bash
+vim-minimal
+rpm
+iputils
+
diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist
index 4544f99e2..4bb432301 100644
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist
@@ -14,3 +14,18 @@ python3
 tar
 bzip2
 bc
+dracut
+dracut-network
+rsyslog
+hostname
+e2fsprogs
+ethtool
+parted
+openssl
+dhclient
+openssh-clients
+bash
+vim-minimal
+rpm
+iputils
+
diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels8.x86_64.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels8.x86_64.pkglist
index 4544f99e2..4bb432301 100644
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels8.x86_64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels8.x86_64.pkglist
@@ -14,3 +14,18 @@ python3
 tar
 bzip2
 bc
+dracut
+dracut-network
+rsyslog
+hostname
+e2fsprogs
+ethtool
+parted
+openssl
+dhclient
+openssh-clients
+bash
+vim-minimal
+rpm
+iputils
+

From 66d5d6cc4c74db4792f7d9db4bc4f6f9931959e7 Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Mon, 23 Mar 2020 14:58:27 -0400
Subject: [PATCH 3/3] arrange the pkglist

---
 .../netboot/rh/compute.rhels8.ppc64le.pkglist | 28 +++++++++----------
 .../netboot/rh/service.rhels8.ppc64le.pkglist |  9 ++++--
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.pkglist
index ae709f861..a39a09128 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.pkglist
@@ -1,17 +1,9 @@
 @minimal-environment
-bash
-openssl
-dhclient
-openssh-server
-openssh-clients
 chrony
-vim-minimal
-ntp
-rpm
-iputils
 kernel
 net-tools
 nfs-utils
+openssh-server
 rsync
 tar
 util-linux
@@ -19,15 +11,23 @@ wget
 python3
 tar
 bzip2
-gzip
-grub2
-grub2-tools
 bc
 dracut
 dracut-network
+rsyslog
 hostname
-parted
 e2fsprogs
 ethtool
-rsyslog
+parted
+openssl
+dhclient
+openssh-clients
+bash
+vim-minimal
+rpm
+iputils
+gzip
+grub2
+grub2-tools
+ntp
 lsvpd
diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist
index 4bb432301..1fea86a57 100644
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist
@@ -8,8 +8,6 @@ rsync
 tar
 util-linux
 wget
-perl-DBD-MySQL
-perl-DBD-Pg
 python3
 tar
 bzip2
@@ -28,4 +26,11 @@ bash
 vim-minimal
 rpm
 iputils
+gzip
+grub2
+grub2-tools
+ntp
+lsvpd
+perl-DBD-MySQL
+perl-DBD-Pg