From eb1f997830ad3e3b73c64099f7624a6388c5d641 Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Tue, 13 Apr 2021 18:09:15 +0200 Subject: [PATCH] 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