From db68e881dec948cdfbdd2ea57cd52204a6e636bc Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 25 Feb 2020 10:53:10 +0100
Subject: [SSUS] Ask to switch to ipxe if ipxelinux is still enabled

---
 satellit_upgrader/updater.template.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 9de22c7..0490138 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -433,8 +433,8 @@ if [ -n "$TGZ_SLXADMIN" ]; then
 	diffcp "slxadmin-boot.service" "/etc/systemd/system/slxadmin-boot.service"
 	ln -nfs "../slxadmin-boot.service" "/etc/systemd/system/multi-user.target.wants/slxadmin-boot.service"
 	# Ask about ipxe / pxelinux
-	if [ -z "$bootmodule" ] || ! [ -d "$PATH_SLXADMIN/modules-available/$bootmodule" ]; then
-		bootmodule="serversetup-bwlp-pxelinux"
+	if [ -z "$bootmodule" ] || [ "$bootmodule" = "serversetup-bwlp-pxelinux" ] || ! [ -d "$PATH_SLXADMIN/modules-available/$bootmodule" ]; then
+		bootmodule="serversetup-bwlp-ipxe"
 		if [ -t 0 ] && [ -t 1 ]; then
 			echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 			echo "Congratulations! You have won a bwLehrpool-Server with iPXE support!"
@@ -442,13 +442,14 @@ if [ -n "$TGZ_SLXADMIN" ]; then
 			echo "It is required for EFI-only netboot (Fujitsu Q958) and assigning different"
 			echo "menus to individual rooms / locations."
 			echo "(Instructions on changing this later can be found in the wiki.)"
-			echo -n "If unsure, say NO here. [y/n]: "
+			echo "Please note that legacy ipxelinux4 support will be removed in the next release."
+			echo -n "If unsure, say YES here. [y/n]: "
 			read answer
 			while ! [[ "$answer" =~ ^[nNyY] ]]; do
 				echo -n "Please answer [Y]es or [N]o: "
 				read answer
 			done
-			[[ "$answer" =~ ^[yY] ]] && bootmodule="serversetup-bwlp-ipxe"
+			[[ "$answer" =~ ^[nN] ]] && bootmodule="serversetup-bwlp-pxelinux"
 		else
 			echo "(Not asking about iPXE vs. pxelinux 4 because we're not running from a terminal)"
 		fi
-- 
cgit v1.2.3-55-g7522