From ef5aa6756cb25be2d0ef49d92923ecb1f89252bb Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 23 Oct 2023 16:33:45 +0200
Subject: [SSUS] Remove choice of keeping pxelinux enabled - unsupported

---
 satellit_upgrader/updater.template.sh | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 8833f04..31e7cc6 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -488,8 +488,6 @@ if [ -n "$TGZ_SLXADMIN" ]; then
 	# Test archive
 	INCMODS=$(mktemp)
 	tar tf "$TMPDIR/$TGZ_SLXADMIN"  | grep -oP '^modules-available/[^/]+/$' > "$INCMODS" || perror "Could not read $TGZ_SLXADMIN"
-	# Remember boot module if already set
-	bootmodule=$( basename "$( readlink -f "$PATH_SLXADMIN/modules/serversetup" 2> /dev/null )" )
 	# Remove old files - wipe selectively, just in case someone added a new module by hand
 	rm -rf -- "$PATH_SLXADMIN/"{inc,apis,modules,templates,Mustache,script,style,modules-available/serversetup-bwlp,modules-available/support,modules-available/usermanagement,modules-available/baseconfig_partitions_cdn,modules-available/internetaccess}
 	while read -r line || [[ -n "$line" ]]; do
@@ -531,34 +529,12 @@ if [ -n "$TGZ_SLXADMIN" ]; then
 	# Service
 	diffcp "slxadmin" "/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" ] || [ "$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!"
-			echo "Do you want to enable iPXE boot support instead of the old ipxelinux4 approach?"
-			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 "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" =~ ^[nN] ]] && bootmodule="serversetup-bwlp-pxelinux"
-		else
-			echo "(Not asking about iPXE vs. pxelinux 4 because we're not running from a terminal)"
-		fi
-	fi
 	# Enable modules
 	(
 		mkdir -p "$PATH_SLXADMIN/modules"
 		cd "$PATH_SLXADMIN/modules" || perror "Cannot cd to slxadmin"
 		echo "Enabling slx-admin modules"
-		for mod in adduser backup baseconfig baseconfig_bwidm baseconfig_bwlp bootstrap_datepicker bootstrap_dialog bootstrap_multiselect bootstrap_switch bootstrap_timepicker dnbd3 dozmod eventlog exams js_chart js_circles js_jqueryui js_moment js_selectize js_stupidtable js_vis js_weekcalendar locationinfo locations main minilinux news passthrough permissionmanager rebootcontrol remoteaccess roomplanner runmode "$bootmodule" session statistics statistics_reporting summernote sysconfig syslog systemstatus vmstore webinterface js_ip; do
+		for mod in adduser backup baseconfig baseconfig_bwidm baseconfig_bwlp bootstrap_datepicker bootstrap_dialog bootstrap_multiselect bootstrap_switch bootstrap_timepicker dnbd3 dozmod eventlog exams js_chart js_circles js_jqueryui js_moment js_selectize js_stupidtable js_vis js_weekcalendar locationinfo locations main minilinux news passthrough permissionmanager rebootcontrol remoteaccess roomplanner runmode serversetup-bwlp-ipxe session statistics statistics_reporting summernote sysconfig syslog systemstatus vmstore webinterface js_ip; do
 			name=${mod%%-*}
 			rm -f -- "$name"
 			ln -s "../modules-available/$mod" "$name" || pwarning "Could not activate module '$mod' (alias '$name')"
-- 
cgit v1.2.3-55-g7522