[debian-edu-commits] [Git][debian-edu/debian-edu-config][trixie] 15 commits: sbin/debian-edu-pxeinstall: Report progress of D-I provisioning to the admin.
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Sun Nov 1 14:00:50 GMT 2026
Mike Gabriel pushed to branch trixie at Debian Edu / debian-edu-config
Commits:
8d803483 by Mike Gabriel at 2026-09-28T10:23:34+02:00
sbin/debian-edu-pxeinstall: Report progress of D-I provisioning to the admin.
- - - - -
bad4ad98 by Roland Clobus at 2026-10-09T14:32:30+02:00
pxeinstall: Always use the versioned logo
This matches the changes in debian-edu-artwork 2.13
- - - - -
eb1f7612 by Roland Clobus at 2026-10-09T14:37:28+02:00
pxeinstall: Update the dark logo too (Closes: #1150417)
- - - - -
fd7cf4b2 by Roland Clobus at 2026-10-09T14:37:37+02:00
ltsp-install: Update for trixie (Closes: #1147625)
Use the more modern deb822 sources as a basis
- - - - -
e9c21db9 by Roland Clobus at 2026-10-09T14:37:37+02:00
finish-install: Keep the BD-ROM mounted (Closes: #1147630, #1147702)
- - - - -
6ea1ef60 by Roland Clobus at 2026-10-09T14:09:13+00:00
Enable the CI for aptly
- - - - -
db78dc64 by Mike Gabriel at 2026-10-09T18:02:05+02:00
release as 2.13.4
Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- - - - -
e48dde44 by Roland Clobus at 2026-10-13T20:59:58+02:00
Fix a typo
Gbp-Dch: ignore
- - - - -
ab7380d6 by Roland Clobus at 2026-10-13T21:47:23+02:00
ltsp-install: Synchronise dlw to x2go (Closes: #1150421)
Use the same order in the code for dlw as for x2go
- - - - -
503dfd56 by Roland Clobus at 2026-10-13T21:47:33+02:00
ltsp-install: Run outside of d-i
The script can be run outside the d-i environment.
If the BD ISO was used to install, and it is still available, use the
packages on the BD ISO instead of downloading them.
- - - - -
d937904f by Mike Gabriel at 2026-10-14T19:58:07+02:00
release as 2.13.5
Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- - - - -
71f2a5b8 by Roland Clobus at 2026-10-29T13:29:50+01:00
Support 'locales-all' (Closes: #1149230)
Instead of installing every single language pack, only install the
languages that are explicitly enabled if locales-all is used
- - - - -
e84cd2d9 by Mike Gabriel at 2026-11-01T14:54:40+01:00
release as 2.13.6
Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- - - - -
e5d977be by Mike Gabriel at 2026-11-01T14:57:25+01:00
Merge tag '2.13.6' into trixie
released as 2.13.6
- - - - -
f264fe6c by Mike Gabriel at 2026-11-01T14:59:27+01:00
release to trixie as 2.13.6~deb13u1
Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- - - - -
8 changed files:
- debian/changelog
- + debian/salsa-ci.yml
- sbin/debian-edu-ltsp-install
- sbin/debian-edu-pxeinstall
- share/debian-edu-config/d-i/finish-install
- share/debian-edu-config/testsuite-lib.sh
- share/debian-edu-config/tools/improve-desktop-l10n
- share/debian-edu-config/tools/install-task-pkgs
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,46 @@
+debian-edu-config (2.13.6~deb13u1) trixie; urgency=medium
+
+ * Release to trixie.
+
+ -- Mike Gabriel <sunweaver at debian.org> Sun, 01 Nov 2026 14:57:41 +0100
+
+debian-edu-config (2.13.6) unstable; urgency=medium
+
+ [ Roland Clobus ]
+ * Support 'locales-all' (Closes: #1149230).
+
+ -- Mike Gabriel <sunweaver at debian.org> Sun, 01 Nov 2026 14:53:56 +0100
+
+debian-edu-config (2.13.5) unstable; urgency=medium
+
+ [ Roland Clobus ]
+ * debian-edu-ltsp-install:
+ - Rework DLW installation method (Closes: #1150421). Apply code path of
+ X2Go thinclient installation method to DLW installation method.
+ - Fix running outside of Debian Installer. The script can be run outside
+ the d-i environment. If the BD ISO was used to install, and it is still
+ available, use the packages on the BD ISO instead of downloading them.
+
+ -- Mike Gabriel <sunweaver at debian.org> Wed, 14 Oct 2026 19:56:17 +0200
+
+debian-edu-config (2.13.4) unstable; urgency=medium
+
+ [ Mike Gabriel ]
+ * sbin/debian-edu-pxeinstall:
+ - Report progress of D-I provisioning to the admin.
+
+ [ Roland Clobus ]
+ * sbin/debian-edu-pxeinstall:
+ - Always use the versioned logo
+ - Update the dark logo too (Closes: #1150417)
+ * sbin/debian-edu-ltsp-install:
+ - Update X2Go TCE preparation for trixie (Closes: #1147625)
+ * finish-install:
+ - Keep the BD-ROM mounted (Closes: #1147630, #1147702).
+ * Enable the CI for aptly.
+
+ -- Mike Gabriel <sunweaver at debian.org> Fri, 09 Oct 2026 18:00:10 +0200
+
debian-edu-config (2.13.3) unstable; urgency=medium
* debian/control:
=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,3 @@
+---
+include:
+ - https://salsa.debian.org/installer-team/branch2repo/raw/main/trigger_b2r.yml
=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -452,12 +452,14 @@ cat <<EOF > /etc/ltsp/skel/.x2goclient/settings
show=false
EOF
-# Specific settings needed if BD ISO image is used for installation inside d-i.
-# First part of next condition: Looking for file created by base-installer and
-# removed at the end of the d-i run.
-if [ -e /etc/apt/apt.conf.d/00IgnoreTimeConflict ] && grep -q BD /etc/apt/sources.list ; then
+# 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
+ bd_iso_was_mounted="yes"
+ mount /media/cdrom -o ro
+fi
+# If the BD ISO image is used, get as many packages as possible from the BD image instead of downloading them.
+if grep -q BD /etc/apt/sources.list && [ -e /media/cdrom/.disk/cd_type ] ; then
BD_ISO="true";
- device="$(grep media/cdrom /etc/fstab | cut -d' ' -f1)"
mirror="file:///media/cdrom/"
else
mirror="http://deb.debian.org/debian"
@@ -475,12 +477,18 @@ debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=sitesummar
unset TMPDIR TEMP TEMPDIR TMP
chroot /srv/ltsp/x2go-"$thin_type"-"$arch"/ apt clean
# Care for complete sources list (security, also nonfree -- in case firmware is needed).
- chroot /srv/ltsp/x2go-"$thin_type"-"$arch"/ sh -c "cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list.d/full.list"
+ if [ -e /srv/ltsp/x2go-"$thin_type"-"$arch"/usr/share/doc/apt/examples/sources.list ] ; then
+ # Up to bookworm
+ chroot /srv/ltsp/x2go-"$thin_type"-"$arch"/ sh -c "cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list.d/full.list"
+ else
+ # Since trixie
+ chroot /srv/ltsp/x2go-"$thin_type"-"$arch"/ sh -c "cp /usr/share/doc/apt/examples/debian.sources /etc/apt/sources.list.d/debian_full.sources"
+ fi
mount /dev/pts -t devpts /srv/ltsp/x2go-"$thin_type"-"$arch"/dev/pts
mount proc -t proc /srv/ltsp/x2go-"$thin_type"-"$arch"/proc
if [ "true" == "$BD_ISO" ] ; then
mkdir -p /srv/ltsp/x2go-"$thin_type"-"$arch"/media/cdrom
- mount "$device" /srv/ltsp/x2go-"$thin_type"-"$arch"/media/cdrom
+ mount /media/cdrom /srv/ltsp/x2go-"$thin_type"-"$arch"/media/cdrom -o bind
echo "deb [trusted=yes] $mirror $dist main" > /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/apt/sources.list
fi
chroot /srv/ltsp/x2go-"$thin_type"-"$arch"/ apt -y -qq install education-thin-client p910nd
@@ -607,7 +615,7 @@ EOF
echo "search intern" >> /etc/resolv.conf
# Temporary workaround needed to turn DLW images into machines of profile type 'Workstation'
sed -i /etc/debian-edu/config -e "s/^PROFILE=.*/PROFILE=\"Workstation\"/g"
- # Create SqashFS image.
+ # Create SquashFS image.
ltsp image /,,/boot,subdir=boot,,/usr,subdir=usr,,/var,subdir=var
# Revert resolver workaround from above.
rm -f /etc/resolv.conf
@@ -638,20 +646,27 @@ POST_INIT_USE_FQDN="sed -i '/10.0.2.2/ s/server/tjener.intern tjener/' /etc/host
EOF
mkdir -p /srv/ltsp/dlw
chmod 755 /srv/ltsp/dlw
- # Use BD-ISO if available.
- if [ "true" == "$BD_ISO" ] && ! mountpoint -q /media/cdrom ; then
- mount /media/cdrom
+ # Install base system
+ debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=locales,console-setup,linux-image-"$kernel_arch" "$dist" /srv/ltsp/dlw "$mirror"
+ # Unset temporary directory variables to avoid problems when directory
+ # is missing inside the chroot. https://bugs.debian.org/765443
+ unset TMPDIR TEMP TEMPDIR TMP
+ chroot /srv/ltsp/dlw/ apt clean
+ # Care for complete sources list (security, also nonfree -- in case firmware is needed).
+ if [ -e /srv/ltsp/dlw/usr/share/doc/apt/examples/sources.list ] ; then
+ # Up to bookworm
+ chroot /srv/ltsp/dlw/ sh -c "cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list.d/full.list"
+ else
+ # Since trixie
+ chroot /srv/ltsp/dlw/ sh -c "cp /usr/share/doc/apt/examples/debian.sources /etc/apt/sources.list.d/debian_full.sources"
fi
- if grep -q BD /etc/apt/sources.list && [ -f /media/cdrom/.disk/info ] ; then
+ mount /dev/pts -t devpts /srv/ltsp/dlw/dev/pts
+ mount proc -t proc /srv/ltsp/dlw/proc
+ if [ "true" == "$BD_ISO" ] ; then
mkdir -p /srv/ltsp/dlw/media/cdrom
- mount --bind /media/cdrom /srv/ltsp/dlw/media/cdrom
- mirror="file:///media/cdrom/"
+ mount /media/cdrom /srv/ltsp/dlw/media/cdrom -o bind
+ echo "deb [trusted=yes] $mirror $dist main" > /srv/ltsp/dlw/etc/apt/sources.list
fi
- # Install base system
- debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=locales,console-setup,linux-image-"$arch" "$dist" /srv/ltsp/dlw "$mirror"
-
- # Care for complete sources list (security, also nonfree -- in case firmware is needed).
- chroot /srv/ltsp/dlw sh -c "cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list.d/full.list"
# Care for same locale and keyboard settings in the chroot, also useful to quiet down Perl.
cp /etc/locale.gen /srv/ltsp/dlw/etc/
@@ -662,14 +677,6 @@ EOF
chroot /srv/ltsp/dlw setupcon -k
# Care for special files.
- # Unset temporary directory variables to avoid problems when directory
- # is missing inside the chroot. https://bugs.debian.org/765443
- unset TMPDIR TEMP TEMPDIR TMP
- mount /dev/pts -t devpts /srv/ltsp/dlw/dev/pts
- mount proc -t proc /srv/ltsp/dlw/proc
- if grep -q BD /etc/apt/sources.list && mountpoint -q /media/cdrom ; then
- echo "deb [trusted=yes] $mirror $dist main" > /srv/ltsp/dlw/etc/apt/sources.list
- fi
mkdir -p /srv/ltsp/dlw/tmp/user/0/
cp /usr/share/debian-edu-config/tools/debian-edu-bless /srv/ltsp/dlw/sbin
@@ -695,12 +702,11 @@ EOF
# Care for temporary mounts.
umount /srv/ltsp/dlw/dev/pts
umount /srv/ltsp/dlw/proc
- if grep -q BD /etc/apt/sources.list && [ -f /media/cdrom/.disk/info ] ; then
+ if [ "true" == "$BD_ISO" ] ; then
umount /srv/ltsp/dlw/media/cdrom
- umount /media/cdrom
fi
- # Create optional SqashFS image file.
+ # Create optional SquashFS image file.
if [ "yes" == "$img" ] ; then
ltsp image dlw
fi
@@ -794,3 +800,8 @@ fi
sed -i "s#ltsp/ltsp.img#ltsp/${img}/ltsp.img#" /srv/tftp/ltsp/ltsp.ipxe
# Add "quiet" and "splash" parameters to hide kernel logs on a boot screen.
sed -i "s/set cmdline ${cmdline_method} ${cmdline_ltsp} ${cmdline_client}$/set cmdline ${cmdline_method} ${cmdline_ltsp} ${cmdline_client} ${KERNEL_PARAMETERS}/" /srv/tftp/ltsp/ltsp.ipxe
+
+# Unmount the BD image, if it was mounted at the start of this script.
+if [ "yes" == "$bd_iso_was_mounted" ] ; then
+ umount /media/cdrom
+fi
=====================================
sbin/debian-edu-pxeinstall
=====================================
@@ -157,6 +157,8 @@ for arch in $archs ; do
(
cd $tftpdir/debian-installer
+ echo -n "Preparing Debian Edu ${di_ver} installer (${arch}) ... "
+
tarball=""
if [ -d /usr/lib/debian-installer/images/ ] && [ -n "$(find /usr/lib/debian-installer/images/ -mindepth 1 -maxdepth 1 -type d 2>/dev/null)" ]; then
@@ -221,15 +223,20 @@ for arch in $archs ; do
mkdir new
cd new
unmkinitramfs ${tftpdir}/debian-installer/${di_ver}/${arch}/initrd.gz .
- if [ ! -z "$theme" ] ; then
- cp /usr/share/pixmaps/debian-edu-${di_ver}-installer-logo.png usr/share/graphics/logo_debian.png
- fi
- find . | cpio -H newc -o > ../initrd
+ cp /usr/share/pixmaps/debian-edu-${di_ver}-installer-logo.png usr/share/graphics/logo_debian.png
+ ln -fs usr/share/graphics/logo_debian.png usr/share/graphics/logo_debian_dark.png
+ find . | cpio -H newc -o 1> ../initrd 2>/dev/null
cd ..
gzip initrd
cp initrd.gz ${tftpdir}/debian-installer/${di_ver}/${arch}/
rm -rf $TMP
fi
+
+ if [ -e "${tftpdir}/debian-installer/${di_ver}/${arch}/initrd.gz" ]; then
+ echo "done."
+ else
+ echo "failed!"
+ fi
)
done
done
=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -30,6 +30,37 @@ preserve_network_interfaces() {
fi
}
+# Make the content of the BD available again and prevent unmounts
+keep_cdrom_mountpoint_active=0
+cd_type=$(cat /cdrom/.disk/cd_type)
+case "$cd_type" in
+ bluray*)
+ keep_cdrom_mountpoint_active=1
+ ;;
+esac
+
+if [ ${keep_cdrom_mountpoint_active} ]; then
+ # /cdrom is mounted, but /target/media/cdrom isn't
+ mount -o bind /cdrom /target/media/cdrom
+ # Restore the 00NoMountCDROM file to prevent unmounting the BD
+ # The file will later be deleted by 90base-installer
+ cat > /target/etc/apt/apt.conf.d/00NoMountCDROM << EOT
+APT::CDROM::NoMount "true";
+Acquire::cdrom {
+ "/media/cdrom/" {
+ Mount "true";
+ UMount "true";
+ };
+ AutoDetect "false";
+}
+EOT
+ # Fixup of /target/etc/apt/sources.list:
+ # 1) Add a line with the magic marker 'BD' needed for debian-edu-ltsp-install
+ # 2) Replace the cdrom: entry with a file entry
+ in-target sed -i -e '1i# Origin BD image' -e 's|cdrom:\[.*\]/|[trusted=yes] file:///media/cdrom/|' /etc/apt/sources.list
+ in-target apt-get update
+fi
+
db_get debian-edu-install/profile
PROFILE="$RET"
@@ -131,6 +162,11 @@ EOF
log "info: Installation is broken; all passwords cleared from debconf database."
fi
+# Cleanup
+if [ ${keep_cdrom_mountpoint_active} ]; then
+ umount /target/media/cdrom
+fi
+
echo "info: processes using mount point below /target"
mountpoints="$(grep " /target" /proc/mounts | cut -d" " -f2 | sed s%/target%%g)"
LANG=C chroot /target fuser -mv $mountpoints 2>&1 | sed 's/^/info: /'
=====================================
share/debian-edu-config/testsuite-lib.sh
=====================================
@@ -44,3 +44,20 @@ check_file_perm() {
fi
}
+
+# Fill the variable 'langsfull' with language codes (e.g. en, en_GB)
+prepare_langsfull() {
+ if deb_installed locales-all ; then
+ langsfull=""
+ if ! [ -z $LANGUAGE ] ; then
+ # If the language priority has been defined, add those languages
+ langsfull="$(echo $LANGUAGE | tr ":" " ") "
+ fi
+ if [ -r /etc/locale.gen ] ; then
+ # The locales that have been explicitly enabled
+ langsfull="$langsfull$(grep -v "^#" /etc/locale.gen | grep UTF-8 | cut -d'.' -f1)"
+ fi
+ else
+ langsfull="$(locale -a|grep utf8|cut -d'.' -f1)"
+ fi
+}
=====================================
share/debian-edu-config/tools/improve-desktop-l10n
=====================================
@@ -9,7 +9,7 @@ set -e
. /usr/share/debian-edu-config/testsuite-lib.sh
-langsfull="$(locale -a|grep utf8|cut -d'.' -f1)"
+prepare_langsfull
for lang in $langsfull ; do
baselang="${lang%_*}"
langcountry="$(echo ${lang%.*}|cut -d'_' -f2 | tr '[:upper:]' '[:lower:]')"
=====================================
share/debian-edu-config/tools/install-task-pkgs
=====================================
@@ -31,7 +31,7 @@ install_pkg123() {
fi
}
-langsfull="$(locale -a | grep utf8 | cut -d'.' -f1)"
+prepare_langsfull
for lang in $langsfull ; do
baselang="${lang%_*}"
# <lang>, <lang>-desktop, <lang>-kde-desktop and <lang>-gnome-desktop tasks; rather weird
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/6b3a05bdb11f137dec09c8dbab86daaa7d1dc416...f264fe6c8e11a63c0cc25e412247174b1b9e4aff
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/6b3a05bdb11f137dec09c8dbab86daaa7d1dc416...f264fe6c8e11a63c0cc25e412247174b1b9e4aff
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/20261101/732f2a02/attachment-0001.htm>
More information about the debian-edu-commits
mailing list