[Git][debian-edu/debian-edu-config][master] sbin/debian-edu-pxeinstall: Support overriding tasksel/desktop selection via...

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
5d768f5f by Mike Gabriel at 2025-09-16T17:43:41+02:00
sbin/debian-edu-pxeinstall: Support overriding tasksel/desktop selection via mydesktop parameter in /etc/debian-edu/pxeinstall.conf.

- - - - -


1 changed file:

- sbin/debian-edu-pxeinstall


Changes:

=====================================
sbin/debian-edu-pxeinstall
=====================================
@@ -57,11 +57,13 @@ else
 	dist=$(lsb_release -sc)
 fi
 
+default_mydesktop="xfce"
+
 [ "$archs" ]      || archs="amd64 i386"
 [ "$mirrorurl" ]  || mirrorurl=http://deb.debian.org/debian
 [ "$hostname" ]   || hostname=pxeinstall
 [ "$domain" ]     || domain=intern
-[ "$mydesktop" ]  || mydesktop=xfce
+[ "$mydesktop" ]  || mydesktop="${default_mydesktop}"
 [ "$graphicdi" ]  || graphicdi=false
 [ "$dailydi" ]    || dailydi=false
 [ "$theme" ]      || theme="$(ls -L /etc/alternatives/desktop-theme/plymouth 2>/dev/null | grep script | cut -d'.' -f 1)"
@@ -86,13 +88,18 @@ fi
 # debian-edu-install, copying the files a bit earlier.
 installconfig=""
 for template in debian-installer/locale \
-	keyboard-configuration/xkb-keymap \
-	tasksel/desktop; do
+                keyboard-configuration/xkb-keymap \
+                tasksel/desktop; do
 	value="$(debconf-get-selections --installer | grep $template | awk '{print $4}')"
 	if [ -z "$value" ] ; then
 		# If there is no value in the installer debconf database, set the default one.
 		# Useful if modular main server installation has been used (no desktop).
-		value="$mydesktop"
+		value="${default_mydesktop}"
+	fi
+
+	if [ "${mydesktop}" != "${default_mydesktop}" ]; then
+		# Let setting from /etc/debian-edu/pxeinstall.conf override tasksel/desktop.
+		value="${mydesktop}"
 	fi
 
 	# Using desktop= as kernel argument work, while tasksel/desktop=



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/5d768f5fe2c5e3f83c3c2c16c0b5c00843db1d03

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/5d768f5fe2c5e3f83c3c2c16c0b5c00843db1d03
You're receiving this email because of your account on salsa.debian.org.

_______________________________________________
debian-edu-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-edu-commits