[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 10 commits: release as 2.13.10

Mike Gabriel (@sunweaver) gitlab at salsa.debian.org
Thu Nov 12 15:08:30 GMT 2026



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


Commits:
b8e894d8 by Mike Gabriel at 2026-11-12T09:50:36+01:00
release as 2.13.10

- - - - -
1f036e67 by Mike Gabriel at 2026-11-12T11:58:31+01:00
Revert "release as 2.13.10"

This reverts commit b8e894d8eff289f23dc288b0a6d47c4fd5612775.

- - - - -
ec8d9ead by Mike Gabriel at 2026-11-12T12:35:21+01:00
debian-edu-ltsp-chroot: Make mounting the Debian Edu Installer BD ISO image optional.

- - - - -
c19aea38 by Mike Gabriel at 2026-11-12T12:37:47+01:00
debian-edu-ltsp-{install,chroot}: Only attempt mounting BD installer medium if there is a medium inserted in the optical drive.

(Closes: #1153825).

- - - - -
a18f7d11 by Mike Gabriel at 2026-11-12T12:52:06+01:00
d/changelog: update from Git history

- - - - -
0ee97866 by Mike Gabriel at 2026-11-12T14:46:16+01:00
Revert "debian-edu-ltsp-install: Stop installing apt-utils, nowadays replaced by apt."

This reverts commit 60e86dfb78f056cf54380cb2106da2a52231bde0.

- - - - -
8b988220 by Mike Gabriel at 2026-11-12T14:47:36+01:00
Revert "debian-edu-ltsp-install: Stop installing ltsp into the LTSP chroot, not needed."

This reverts commit f0e0f35ab9161867efc4436d9d245e033a65c8c4.

- - - - -
cecfc775 by Mike Gabriel at 2026-11-12T14:51:28+01:00
debian-edu-ltsp-install: Stop installing apt-utils, nowadays replaced by apt.

Better explain, why we install the ltsp package into the chroot, although this
is actually not needed (except for the kernel initrd creation process).

- - - - -
23c94db9 by Mike Gabriel at 2026-11-12T14:54:15+01:00
d/changelog: Adjust to recent reverts and changes

- - - - -
01913c47 by Mike Gabriel at 2026-11-12T16:08:19+01:00
etc/debian-edu/thin/x2gothinclient-minidesktop_start: typo fix

- - - - -


4 changed files:

- debian/changelog
- etc/debian-edu/thin/x2gothinclient-minidesktop_start
- sbin/debian-edu-ltsp-chroot
- sbin/debian-edu-ltsp-install


Changes:

=====================================
debian/changelog
=====================================
@@ -29,11 +29,10 @@ debian-edu-config (2.13.10) UNRELEASED; urgency=medium
     - Use apt-get instead of apt (no cmdline API guarantee for apt).
       Also, stop using -qq. It will hide mistakes which we may want to notice
       rather.
-    - Stop installing ltsp into the LTSP chroot, not needed. The whole LTSP
-      client code is injected into the LTSP chroot via the LTSP initrd file
-      ltsp.img via the kernel cmdline. That said, no matter what chroot gets
-      booted via PXE, the LTSP client will always use the ltsp code that is
-      installed on the host. Further readings: LTSP documentation.
+    - Stop installing apt-utils, nowadays replaced by apt. In addition, better
+      explain (in comment), why we install the ltsp package into the chroot,
+      although this is actually not needed (except for the kernel initrd
+      creation process).
     - Run apt-get update && apt-get upgrade to have latest updates.
       If a BD installation medium is used, debootstrap installs all packages
       from that medium. If we are not offline, we want to ensure that security
@@ -45,6 +44,10 @@ debian-edu-config (2.13.10) UNRELEASED; urgency=medium
     - Gracefully mount/unmount Debian Edu BD ISO image into chroot if configured
       and media is inserted. (Closes: #1153756).
     - Configure resolv.conf when entering an LTSP chroot. (Closes: #1153757).
+    - Make mounting the Debian Edu Installer BD ISO image optional.
+  * debian-edu-ltsp-{install,chroot}:
+    - Only attempt mounting BD installer medium if there is a medium inserted
+      in the optical drive. (Closes: #1153825).
   * debian-edu-ltsp-ipxe:
     - Add background image to iPXE boot menu (if the iPXE version supports it).
       (Closes: #1153755).
@@ -53,6 +56,11 @@ debian-edu-config (2.13.10) UNRELEASED; urgency=medium
     - White-space fixes.
     - Indentation fixes.
     - Add additional lines here and there.
+  * share/debian-edu-config/squid.conf:
+    - Comment out 'dns_v4_first on' as it throws verbose obsoletion warnings in
+      the logs (mentioning that this config will have no effect anymore anyway).
+      Also, add a FIXME reminder, because we might have to reinvestigate this
+      deeper. (Closes: #1153771).
 
  -- Mike Gabriel <sunweaver at debian.org>  Wed, 11 Nov 2026 21:09:23 +0100
 


=====================================
etc/debian-edu/thin/x2gothinclient-minidesktop_start
=====================================
@@ -29,7 +29,7 @@
                          --kbd-type=auto \
                          --set-kbd=1 \
                          --geometry=fullscreen \
-                         --background=/usr/share/desktop-base/active-theme/login/background-nologo.svg
+                         --background=/usr/share/desktop-base/active-theme/login/background-nologo.svg \
                          --read-exports-from=~/export \
                          --no-session-edit \
                          --close-disconnect \


=====================================
sbin/debian-edu-ltsp-chroot
=====================================
@@ -40,6 +40,9 @@ Options:
                                 previous to chrooting.
   -h, --help                    Displays the debian-edu-ltsp-chroot help message.
   -p, --mount-proc              If set, mounts the server /proc to the chroot previous to chrooting.
+  -i, --mount-isoimage          If set (and Debian Edu BD ISO image is inserted into the optical drive),
+                                this mounts the installation medium to /media/cdrom and bind-mounts
+                                this into the chroot.
   -m, --mount-all               If set, does both --mount-dev and --mount-proc previous to chrooting.
       --version                 Output version information and exit.
 EOF
@@ -57,6 +60,7 @@ pre_chroot() {
     if boolean_is_true "$MOUNT_ALL"; then
         MOUNT_DEV=true
         MOUNT_PROC=true
+        MOUNT_ISOIMAGE=true
     fi
     if boolean_is_true "$MOUNT_DEV"; then
         mark_mount --bind "/dev" "$BASE/dev"
@@ -67,17 +71,20 @@ pre_chroot() {
     fi
 
     # If the BD ISO image was used and it is still inserted, ensure that it is mounted.
-    if grep -q BD /etc/apt/sources.list && ! mountpoint -q /media/cdrom ; then
-        if mark_mount -o ro /media/cdrom 2>/dev/null; then
-            bd_iso_was_mounted="yes"
+    if boolean_is_true "$MOUNT_ISOIMAGE"; then
+        # FIXME: this does not honour metal box installations from a USB iso9660 medium!
+        if grep -q BD /etc/apt/sources.list && ! mountpoint -q /media/cdrom && blkid /dev/sr0 1>/dev/null; then
+            if mark_mount -o ro /media/cdrom 2>/dev/null; then
+                bd_iso_was_mounted="yes"
+            fi
         fi
-    fi
 
-    # If the BD ISO image is used, make it available inside the chroot, so that as many
-    # packages as possible are obtained from the BD image instead of downloading them.
-    if grep -q BD /etc/apt/sources.list && [ -e /media/cdrom/.disk/cd_type ] ; then
-        mkdir -p "${BASE}/media/cdrom"
-        mark_mount --bind /media/cdrom "${BASE}/media/cdrom"
+        # If the BD ISO image is used, make it available inside the chroot, so that as many
+        # packages as possible are obtained from the BD image instead of downloading them.
+        if grep -q BD /etc/apt/sources.list && [ -e /media/cdrom/.disk/cd_type ] ; then
+            mkdir -p "${BASE}/media/cdrom"
+            mark_mount --bind /media/cdrom "${BASE}/media/cdrom"
+        fi
     fi
 
     if [ ! -e "${BASE}/etc/resolv.conf" ]; then


=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -314,7 +314,8 @@ EOF
 fi
 
 # If the BD ISO image is used, ensure that it is mounted.
-if grep -q BD /etc/apt/sources.list && ! mountpoint -q /media/cdrom ; then
+# FIXME: this does not honour metal box installations from a USB iso9660 medium!
+if grep -q BD /etc/apt/sources.list && ! mountpoint -q /media/cdrom && blkid /dev/sr0 1>/dev/null; then
 	bd_iso_was_mounted="yes"
 	mount /media/cdrom -o ro
 fi
@@ -553,8 +554,15 @@ if [ "yes" == "$dlw"  ] ; then
 	chroot /srv/ltsp/dlw/ apt-get update
 	chroot /srv/ltsp/dlw/ apt-get -q -y upgrade
 
-	# Dependencies required by LTSP
-	chroot /srv/ltsp/dlw/ apt-get -q -y install busybox iproute2 systemd-sysv
+	# Install the ltsp package. Most of LTSP's client code is provided by the
+	# ltsp.img initrd injected into the LTSP client via kernel cmdline.
+	# However, for generating the kernel's initrd from within the DLW chroot,
+	# we need /usr/share/initramfs-tools/hooks/ltsp-next.
+	#
+	# We could copy the host's version into the DLW chroot, but who knows what
+	# changes might break this process in the future (either on host or in
+	# LTSP chroot). Better use ltsp from the LTSP client's Debian version.
+	chroot /srv/ltsp/dlw apt-get install -y -q ltsp
 
 	# Turn system into a Debian Edu workstation.
 	chroot /srv/ltsp/dlw sh -c "PROFILE=Workstation DESKTOP=$desktop /sbin/debian-edu-bless"



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/8f5e2d07e46eaed8a3b6473820643a3280ca4bbf...01913c477b986c06e27bda226507057e8e192b5a

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/8f5e2d07e46eaed8a3b6473820643a3280ca4bbf...01913c477b986c06e27bda226507057e8e192b5a
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/cc65b2fa/attachment-0001.htm>


More information about the debian-edu-commits mailing list