From cc4d694c8ea2a69367966f9d6609be1141f3243f Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Sun, 12 Apr 2020 23:34:41 +0200
Subject: [PATCH] Change test order

---
 files/usr/local/sbin/install_pxe_CentOS8.sh | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/files/usr/local/sbin/install_pxe_CentOS8.sh b/files/usr/local/sbin/install_pxe_CentOS8.sh
index c2d6643..3908011 100755
--- a/files/usr/local/sbin/install_pxe_CentOS8.sh
+++ b/files/usr/local/sbin/install_pxe_CentOS8.sh
@@ -43,17 +43,7 @@ fi
 if [ ! -z "$STATIC" ]; then
 	INST_OPTIONS="ip=$IP::$GW:$MASK:$(hostname -s):$IF:off:${DNS/,*} ${INST_OPTIONS}"
 fi
-if [ -f /boot/grub/grub.conf ]; then
-	cat >> /boot/grub/grub.conf <<EOF
-title CentOS 8 Install (PXE)
-        root (hd0,0)
-        kernel $PARTBOOT/vmlinuz ${INST_OPTIONS} inst.ks=http://boot.reslinger.net/ks8.cfg inst.stage2=$MIRROIR ${CONSOLE}
-        initrd $PARTBOOT/initrd.img
-EOF
-	NB="$(grep -Ev '^($| *#)' /boot/grub/grub.conf | grep -c title)"
-	NB=$[$NB-1]
-	echo -e "savedefault --default=$NB --once\nquit\n" | grub --batch
-elif [ -f /boot/grub2/grub.cfg ]; then
+if [ -f /boot/grub2/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/ $//')"
@@ -91,6 +81,16 @@ EOF
 	fi
 	grub2-mkconfig --output="${CONFDIR}"/grub.cfg
 	grub2-reboot 'CentOS 8 Install (PXE)'
+elif [ -f /boot/grub/grub.conf ]; then
+	cat >> /boot/grub/grub.conf <<EOF
+title CentOS 8 Install (PXE)
+        root (hd0,0)
+        kernel $PARTBOOT/vmlinuz ${INST_OPTIONS} inst.ks=http://boot.reslinger.net/ks8.cfg inst.stage2=$MIRROIR ${CONSOLE}
+        initrd $PARTBOOT/initrd.img
+EOF
+	NB="$(grep -Ev '^($| *#)' /boot/grub/grub.conf | grep -c title)"
+	NB=$[$NB-1]
+	echo -e "savedefault --default=$NB --once\nquit\n" | grub --batch
 else
 	echo "Bootloader non identifié !" >&2
 	exit 1