[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] debian-edu-{pxeinstall, ltsp-ipxe}: Regression fix for Debian Installer menu items in iPXE boot menu
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Thu Nov 12 18:53:21 GMT 2026
Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config
Commits:
0abf54e2 by Mike Gabriel at 2026-11-12T19:52:16+01:00
debian-edu-{pxeinstall,ltsp-ipxe}: Regression fix for Debian Installer menu items in iPXE boot menu
The kernel boot cmdline contained empty fields due to variables not
having been properly prepared by the debian-edu-ltsp-ipxe script,
leading to installation failures during iPXE based Debian Edu host
installation.
(Closes: #1153850).
- - - - -
2 changed files:
- sbin/debian-edu-ltsp-ipxe
- sbin/debian-edu-pxeinstall
Changes:
=====================================
sbin/debian-edu-ltsp-ipxe
=====================================
@@ -19,13 +19,57 @@ else
dist_version=$(lsb_release -sr)
fi
+
+# For PXE installation part of the ltsp.ipxe file
[ "$archs" ] || archs="amd64"
[ "$theme" ] || theme="$(ls -L /etc/alternatives/desktop-theme/plymouth 2>/dev/null | grep script | cut -d'.' -f 1)"
+[ "$hostname" ] || hostname=pxeinstall
+[ "$domain" ] || domain=intern
+[ "$mydesktop" ] || mydesktop="${default_mydesktop}"
+[ "$graphicdi" ] || graphicdi=false
+
+# Where to find the preseed file on the web
+preseedurl=http://www/debian-edu-install.dat
if [ -f /etc/debian-edu/config ] ; then
. /etc/debian-edu/config
fi
+# Allow site specific overrides to the variables
+if [ -f /etc/debian-edu/pxeinstall.conf ] ; then
+ . /etc/debian-edu/pxeinstall.conf
+fi
+
+# This part does not work from within debian-installer, as it is
+# executed from cfengine before the cdebconf files are copied into
+# /var/log/installer/cdebconf/ ("debconf-get-selections --installer"
+# does not work). A workaround for this issue was added to
+# debian-edu-install, copying the files a bit earlier.
+installconfig=""
+for template in debian-installer/locale \
+ keyboard-configuration/xkb-keymap \
+ tasksel/desktop; do
+ value="$(debconf-get-selections --installer | grep $template | awk '{print $4}')"
+ if [ "tasksel/desktop" = $template ] && [ -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="${default_mydesktop}"
+ fi
+ if [ "tasksel/desktop" = $template ] && [ "${mydesktop}" != "${default_mydesktop}" ]; then
+ # Let setting from /etc/debian-edu/pxeinstall.conf override tasksel/desktop.
+ value="${mydesktop}"
+ fi
+
+ # Map the long debconf names to the keywords supported in the kernel cmdline.
+ if [ "tasksel/desktop" = $template ] ; then template=desktop; fi
+ if [ "debian-installer/locale" = $template ] ; then template=locale; fi
+ if [ "keyboard-configuration/xkb-keymap" = $template ] ; then template=keymap; fi
+
+ if [ "$value" ]; then
+ installconfig="$installconfig $template=$value"
+ fi
+done
+
tftpdir=/srv/tftp
# Start from a clean state after any configuration changes have been made.
@@ -61,7 +105,7 @@ echo "Generating $menufile"
# Based upon locale, keymap and desktop values used during main-server installation; auto URL added.
:${arch}_${di_ver}
-set params auto url=http://www/debian-edu-install.dat hostname=$hostname domain=$domain $installconfig $gtkvideo --- quiet
+set params auto url=${preseedurl} hostname=$hostname domain=$domain $installconfig $gtkvideo --- quiet
kernel /debian-installer/${di_ver}/${arch}/linux initrd=initrd.gz \${params}
initrd /debian-installer/${di_ver}/${arch}/initrd.gz
boot || goto failed
=====================================
sbin/debian-edu-pxeinstall
=====================================
@@ -61,13 +61,8 @@ else
dist_version=$(lsb_release -sr)
fi
-default_mydesktop="xfce"
-
[ "$archs" ] || archs="amd64"
[ "$mirrorurl" ] || mirrorurl=http://deb.debian.org/debian
-[ "$hostname" ] || hostname=pxeinstall
-[ "$domain" ] || domain=intern
-[ "$mydesktop" ] || mydesktop="${default_mydesktop}"
[ "$graphicdi" ] || graphicdi=false
[ "$dailydi" ] || dailydi=false
# Not hardcoded to allow PXE installation of a main-server without a
@@ -84,42 +79,8 @@ if [ -f /etc/debian-edu/pxeinstall.conf ] ; then
. /etc/debian-edu/pxeinstall.conf
fi
-# This part does not work from within debian-installer, as it is
-# executed from cfengine before the cdebconf files are copied into
-# /var/log/installer/cdebconf/ ("debconf-get-selections --installer"
-# does not work). A workaround for this issue was added to
-# debian-edu-install, copying the files a bit earlier.
-installconfig=""
-for template in debian-installer/locale \
- 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="${default_mydesktop}"
- fi
-
- if [ "tasksel/desktop" = $template ] && [ "${mydesktop}" != "${default_mydesktop}" ]; then
- # Let setting from /etc/debian-edu/pxeinstall.conf override tasksel/desktop.
- value="${mydesktop}"
- fi
-
- # Map the long debconf names to the keywords supported in the kernel cmdline.
- if [ "tasksel/desktop" = $template ] ; then template=desktop; fi
- if [ "debian-installer/locale" = $template ] ; then template=locale; fi
- if [ "keyboard-configuration/xkb-keymap" = $template ] ; then template=keymap; fi
-
- if [ "$value" ] ; then
- installconfig="$installconfig $template=$value"
- fi
-done
-
tftpdir=/srv/tftp
-# Where to find the preseed file on the web
-preseedurl=http://www/debian-edu-install.dat
-
# Where the preseed file is on the disk.
preseedfile=/etc/debian-edu/www/debian-edu-install.dat
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/0abf54e25556601b58f7d0857ca64e058b4990b6
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/0abf54e25556601b58f7d0857ca64e058b4990b6
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20261112/4dbe992a/attachment-0001.htm>
More information about the debian-edu-commits
mailing list