[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Start 2.12.27 development.

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian Edu / debian-edu-config


Commits:
dd869f17 by Holger Levsen at 2023-02-03T17:55:07+01:00
Start 2.12.27 development.

d/changelog entries will be written on release
using the git commit messages.

Use 'gbp dch --since 2.12.26'
to write d/changelog entries since that last release.

Gbp-Dch: ignore
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
260af4c3 by Holger Levsen at 2023-02-03T17:55:07+01:00
debian-edu-pxeinstall: adopt to recent changes in mentest86+. Thanks to Wolfgang Schweer.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- debian/changelog
- sbin/debian-edu-pxeinstall


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+debian-edu-config (2.12.27) UNRELEASED; urgency=medium
+
+  * Start 2.12.27 development. d/changelog entries will be written on
+    release using the git commit messages.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 03 Feb 2023 17:54:56 +0100
+
 debian-edu-config (2.12.26) unstable; urgency=medium
 
   * tools/create-debian-edu-certs: use chown with colon instead of a dot,


=====================================
sbin/debian-edu-pxeinstall
=====================================
@@ -298,7 +298,8 @@ else
 	mkdir -p $tftpdir/ltsp/
 	cp /usr/lib/ipxe/undionly.kpxe $tftpdir/ltsp/
 	cp /usr/lib/ipxe/snponly.efi $tftpdir/ltsp/
-	cp /boot/memtest86+.bin $tftpdir/ltsp/
+	cp /boot/memtest86+x32.bin $tftpdir/ltsp/memtest.0
+	cp /boot/memtest86+x64.efi $tftpdir/ltsp/memtest.efi
 	echo "Generating $tftpdir/ltsp/ltsp.ipxe"
 	cat <<EOF > /srv/tftp/ltsp/ltsp.ipxe
 #!ipxe
@@ -331,7 +332,7 @@ choose --timeout \${menu-timeout} --default \${img} img || goto cancel
 goto \${img}
 
 :memtest
-iseq \${platform} pcbios && kernel memtest86+.bin || kernel memtest.efi
+iseq \${platform} pcbios && kernel memtest.0 || kernel memtest.efi
 # Boot "fails" on normal memtest exit with Esc, so show the menu again
 boot ||
 goto start



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/d052230e8458ce139d2198df03c6dd1076e7a7ec...260af4c399cf22a74c9512a244ec00453f45d433

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/d052230e8458ce139d2198df03c6dd1076e7a7ec...260af4c399cf22a74c9512a244ec00453f45d433
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20230203/8f2d5e06/attachment-0001.htm>