[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 4 commits: pxeinstall: Always use the versioned logo

[Mike Gabriel (@sunweaver)]

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


Commits:
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)

- - - - -


3 changed files:

- sbin/debian-edu-ltsp-install
- sbin/debian-edu-pxeinstall
- share/debian-edu-config/d-i/finish-install


Changes:

=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -475,12 +475,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 "$device" /srv/ltsp/x2go-"$thin_type"-"$arch"/media/cdrom -o ro
 		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


=====================================
sbin/debian-edu-pxeinstall
=====================================
@@ -223,9 +223,8 @@ 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
+			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


=====================================
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: /'



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/8d80348399a8b0d14d4be635b55c6639e80b6f93...e9c21db9ebe54533d19414a0d5a820b63789e6fb

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/8d80348399a8b0d14d4be635b55c6639e80b6f93...e9c21db9ebe54533d19414a0d5a820b63789e6fb
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/20261009/5041228d/attachment-0001.htm>