From 0db0707af4208d54b838e061ea872fa27dec9793 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Tue, 13 Apr 2021 18:08:06 +0200
Subject: [PATCH 1/2] Fix EPEL for OracleLinux + Add tcp_wrappers on EL8

---
 tasks/main.yml    | 15 ++++++++++++++-
 vars/RedHat_8.yml |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 4e1252c..8fbeef8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,6 +22,19 @@
       - epel-release
     when:
       - ansible_os_family == "RedHat"
+      - not ansible_distribution == "OracleLinux"
+      - not ansible_machine == "armv7l"
+      - not ansible_machine == "armv6l"
+
+  - name: Install EPEL repo definition packages for OracleLinux on x86_64 and aarch64 plateform
+    package:
+      name: "{{ item }}"
+      update_cache: yes
+      state: present
+    with_items:
+      - oracle-epel-release-el8
+    when:
+      - ansible_distribution == "OracleLinux"
       - not ansible_machine == "armv7l"
       - not ansible_machine == "armv6l"
 
@@ -156,6 +169,6 @@
         - not hostsallow.stat.exists
     when:
       - ansible_os_family == "RedHat"
-      - ansible_distribution_major_version < '8'
+#      - ansible_distribution_major_version < '8'
   tags:
     - base
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
index b2c2022..a807222 100644
--- a/vars/RedHat_8.yml
+++ b/vars/RedHat_8.yml
@@ -24,6 +24,7 @@ base_packages:
   - wget
   - xz
   - dnf-automatic
+  - tcp_wrappers
 
 base_packages_servers:
   - "@^minimal-environment"

From eb1f997830ad3e3b73c64099f7624a6388c5d641 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Tue, 13 Apr 2021 18:09:15 +0200
Subject: [PATCH 2/2] Fix for OracleLinux and RedHat case

---
 files/usr/local/sbin/install_pxe.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/files/usr/local/sbin/install_pxe.sh b/files/usr/local/sbin/install_pxe.sh
index 46cee7a..e09d3b0 100755
--- a/files/usr/local/sbin/install_pxe.sh
+++ b/files/usr/local/sbin/install_pxe.sh
@@ -39,7 +39,7 @@ else
 	exit 1
 fi
 #DESKTOP=desktop
-INST_OPTIONS="lang=fr_FR keymap=fr-latin9 panic=1 ks.sendsn ks.sendmac inst.sshd=1 net.ifnames=0 biosdevname=0 $DESKTOP"
+INST_OPTIONS="inst.lang=fr_FR inst.keymap=fr-latin9 panic=1 ks.sendsn ks.sendmac inst.sshd=1 net.ifnames=0 biosdevname=0 $DESKTOP"
 INST_OPTIONS="${INST_OPTIONS} inst.vnc inst.vncpassword=SDFGHJKL"
 if [ -z "$DNS" ]; then
 	if [ $(whois $IP | grep -ci dedibox) -gt 0 ]; then
@@ -66,7 +66,7 @@ fi
 if [ ! -z "$STATIC" ]; then
 	INST_OPTIONS="ip=$IP::$GW:$MASK:$(hostname -s):$IF:off:${DNS/,*} ${INST_OPTIONS}"
 fi
-if [ -f /boot/grub2/grub.cfg -o -f /boot/efi/EFI/centos/grub.cfg ]; then
+if [ -f /boot/grub2/grub.cfg -o -f /boot/efi/EFI/centos/grub.cfg -o -f /boot/efi/EFI/redhat/grub.cfg ]; then
   if [ $(sed 's/ /\n/g' /proc/cmdline | grep -c console) -gt 1 ]; then
 	#  echo "On ajoute les console pour avoir une config également en serial"
 	  CONSOLE="$(for i in `sed 's/ /\n/g' /proc/cmdline | grep console`; do echo -n "$i "; done | sed 's/ $//')"
@@ -97,7 +97,9 @@ menuentry 'CentOS ${CENTOS_VERSION} Install (PXE)' --unrestricted {
         initrd  $PARTBOOT/initrd.img
 }
 EOF
-	if [ -d /sys/firmware/efi -a -e /boot/efi/EFI/centos/grub.cfg ]; then
+	if [ -d /sys/firmware/efi -a -e /boot/efi/EFI/redhat/grub.cfg ]; then
+        CONFDIR=/boot/efi/EFI/redhat
+    elif [ -d /sys/firmware/efi -a -e /boot/efi/EFI/centos/grub.cfg ]; then
 		CONFDIR=/boot/efi/EFI/centos
 	else
 		CONFDIR=/boot/grub2