Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: debian-edu-inst...@packages.debian.org,
debian-edu@lists.debian.org
Control: affects -1 + src:debian-edu-install
In the course of working towards the initial release of Debian Edu 12, we
have updated the debian-edu-install component. The overall idea for
Debian Edu components is to bring the testing/unstable versions to
bookworm as-is. The development of debian-edu-* packages currently is
most and for all targetting Debian Edu 12 (aka bookworm). We are not
bringing in new features, we merely work on getting Debian Edu 12 to
work as it used to in Debian Edu 11.
[ Reason ]
The debian-edu-install packages esp. defines storage requirements for the
Debian Edu Installer (being a variant of D-I).
With this storage requiment various other fixes are provided.
[ Impact ]
If this does not get accepted, there will be no Debian Edu for bookworm.
Esp. system installation from Debian's image files will fail due to wrong
(too small) auto-partitioning.
[ Tests ]
Manual tests during installation using incomplete Debian Edu 12.0 ISO
netinst images.
[ Risks ]
No risk for non-Debian-Edu users.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
+ [ Guido Berhoerster ]
+ * Adjust D-I auto-partitioning sizes for bullseye and bookworm (closes:
+ #1038792):
+ - Only show profiles in make minimum-diskreq
+ - Add partition size data for bullseye
+ - Properly declare phony targets in Makefile
+ - Increase partition sizes for main-server (90edumain)
+ - Increase partition sizes for main-server + thinclient-server (91edumain+
+ ltsp)
+ - Increase partition sizes for main-server + workstation (92edumain+ws)
+ - Update after running 'make update-partman-recipes'
+ * README: Fix measured sizes of /srv/ltsp.
The above mentioned storage / partitioning size adjustments for bookworm.
+ [ Mike Gabriel ]
+ * debian-edu-profile:
+ - Use '=' instead of '==' in dash script. Thanks, lintian.
+ * lib/debian-edu-common:
+ - Add shebang (#!/bin/sh) to silence lintian with 'W: debian-edu-profile-
+ udeb udeb: executable-not-elf-or-script [lib/debian-edu-common]'.
+ * debian/debian-edu-profile-udeb.postinst:
+ + Drop #DEBHELPER# macro. The have no effect in udeb:pkgs. Thanks, lintian.
lintian clean-up, mostly.
[ Other info ]
None. If any more info is needed, please let us know.
diff -Nru debian-edu-install-2.12.8/debian/changelog
debian-edu-install-2.12.9~deb12u1/debian/changelog
--- debian-edu-install-2.12.8/debian/changelog 2023-02-26 10:15:55.000000000
+0100
+++ debian-edu-install-2.12.9~deb12u1/debian/changelog 2023-08-29
23:10:45.000000000 +0200
@@ -1,3 +1,35 @@
+debian-edu-install (2.12.9~deb12u1) bookworm; urgency=medium
+
+ * Release to bookworm.
+
+ -- Mike Gabriel <sunwea...@debian.org> Tue, 29 Aug 2023 23:10:45 +0200
+
+debian-edu-install (2.12.9) unstable; urgency=medium
+
+ [ Guido Berhoerster ]
+ * Adjust D-I auto-partitioning sizes for bullseye and bookworm (closes:
+ #1038792):
+ - Only show profiles in make minimum-diskreq
+ - Add partition size data for bullseye
+ - Properly declare phony targets in Makefile
+ - Increase partition sizes for main-server (90edumain)
+ - Increase partition sizes for main-server + thinclient-server (91edumain+
+ ltsp)
+ - Increase partition sizes for main-server + workstation (92edumain+ws)
+ - Update after running 'make update-partman-recipes'
+ * README: Fix measured sizes of /srv/ltsp.
+
+ [ Mike Gabriel ]
+ * debian-edu-profile:
+ - Use '=' instead of '==' in dash script. Thanks, lintian.
+ * lib/debian-edu-common:
+ - Add shebang (#!/bin/sh) to silence lintian with 'W: debian-edu-profile-
+ udeb udeb: executable-not-elf-or-script [lib/debian-edu-common]'.
+ * debian/debian-edu-profile-udeb.postinst:
+ + Drop #DEBHELPER# macro. The have no effect in udeb:pkgs. Thanks, lintian.
+
+ -- Mike Gabriel <sunwea...@debian.org> Sat, 19 Aug 2023 16:32:09 +0200
+
debian-edu-install (2.12.8) unstable; urgency=medium
* turkish debconf translation update, thanks to Atila KOÇ. Closes: #1031667.
diff -Nru debian-edu-install-2.12.8/debian/debian-edu-profile-udeb.postinst
debian-edu-install-2.12.9~deb12u1/debian/debian-edu-profile-udeb.postinst
--- debian-edu-install-2.12.8/debian/debian-edu-profile-udeb.postinst
2020-10-19 09:25:24.000000000 +0200
+++ debian-edu-install-2.12.9~deb12u1/debian/debian-edu-profile-udeb.postinst
2023-08-29 23:10:13.000000000 +0200
@@ -2,8 +2,6 @@
set -e
-#DEBHELPER#
-
# Get rid of setting DEBIAN_TASKS_ONLY (introduced by pkgsel-udeb 0.45)
# to allow the installation of education tasks in the target chroot,
# where this setting is evaluated (since tasksel 3.39).
diff -Nru debian-edu-install-2.12.8/debian-edu-profile
debian-edu-install-2.12.9~deb12u1/debian-edu-profile
--- debian-edu-install-2.12.8/debian-edu-profile 2022-04-05
18:13:53.000000000 +0200
+++ debian-edu-install-2.12.9~deb12u1/debian-edu-profile 2023-08-29
23:10:13.000000000 +0200
@@ -494,7 +494,7 @@
if [ false = "$expert" ] ; then
# Check if it runs at default value, and bump if it does.
if db_get debconf/priority && [ "$RET" ] ; then
- if [ $RET == "high" ] ; then db_set "debconf/priority" "critical";
fi
+ if [ $RET = "high" ] ; then db_set "debconf/priority" "critical"; fi
fi
fi
fi
diff -Nru debian-edu-install-2.12.8/lib/debian-edu-common
debian-edu-install-2.12.9~deb12u1/lib/debian-edu-common
--- debian-edu-install-2.12.8/lib/debian-edu-common 2017-03-02
20:20:10.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/lib/debian-edu-common 2023-08-29
23:10:13.000000000 +0200
@@ -1,3 +1,5 @@
+#!/bin/sh
+
load_proxy_conf() {
db_get mirror/protocol || true
local PROTOCOL="$RET"
diff -Nru debian-edu-install-2.12.8/lib/partman/common/90edumain
debian-edu-install-2.12.9~deb12u1/lib/partman/common/90edumain
--- debian-edu-install-2.12.8/lib/partman/common/90edumain 2023-01-30
13:31:11.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/lib/partman/common/90edumain
2023-08-29 23:10:13.000000000 +0200
@@ -10,7 +10,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+512 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -18,7 +18,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-3904 4000 8192 ext4
+4096 4000 8192 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-2.12.8/lib/partman/common/91edumain+ltsp
debian-edu-install-2.12.9~deb12u1/lib/partman/common/91edumain+ltsp
--- debian-edu-install-2.12.8/lib/partman/common/91edumain+ltsp 2023-01-30
14:07:21.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/lib/partman/common/91edumain+ltsp
2023-08-29 23:10:13.000000000 +0200
@@ -18,7 +18,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-17024 4000 20480 ext4
+18752 4000 22528 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-2.12.8/lib/partman/common/92edumain+ws
debian-edu-install-2.12.9~deb12u1/lib/partman/common/92edumain+ws
--- debian-edu-install-2.12.8/lib/partman/common/92edumain+ws 2023-01-30
13:47:30.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/lib/partman/common/92edumain+ws
2023-08-29 23:10:13.000000000 +0200
@@ -10,7 +10,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+384 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-2.12.8/lib/partman/recipes/90edumain
debian-edu-install-2.12.9~deb12u1/lib/partman/recipes/90edumain
--- debian-edu-install-2.12.8/lib/partman/recipes/90edumain 2023-01-30
14:09:03.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/lib/partman/recipes/90edumain
2023-08-29 23:10:13.000000000 +0200
@@ -9,7 +9,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+512 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -17,7 +17,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-3904 4000 8192 ext4
+4096 4000 8192 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-2.12.8/lib/partman/recipes/91edumain+ltsp
debian-edu-install-2.12.9~deb12u1/lib/partman/recipes/91edumain+ltsp
--- debian-edu-install-2.12.8/lib/partman/recipes/91edumain+ltsp
2023-01-30 14:09:03.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/lib/partman/recipes/91edumain+ltsp
2023-08-29 23:10:13.000000000 +0200
@@ -17,7 +17,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-17024 4000 20480 ext4
+18752 4000 22528 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-2.12.8/lib/partman/recipes/92edumain+ws
debian-edu-install-2.12.9~deb12u1/lib/partman/recipes/92edumain+ws
--- debian-edu-install-2.12.8/lib/partman/recipes/92edumain+ws 2023-01-30
14:09:03.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/lib/partman/recipes/92edumain+ws
2023-08-29 23:10:13.000000000 +0200
@@ -9,7 +9,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+384 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-2.12.8/lib/partman/recipes-amd64-efi/90edumain
debian-edu-install-2.12.9~deb12u1/lib/partman/recipes-amd64-efi/90edumain
--- debian-edu-install-2.12.8/lib/partman/recipes-amd64-efi/90edumain
2023-01-30 14:09:03.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/lib/partman/recipes-amd64-efi/90edumain
2023-08-29 23:10:13.000000000 +0200
@@ -15,7 +15,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+512 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -23,7 +23,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-3904 4000 8192 ext4
+4096 4000 8192 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru
debian-edu-install-2.12.8/lib/partman/recipes-amd64-efi/91edumain+ltsp
debian-edu-install-2.12.9~deb12u1/lib/partman/recipes-amd64-efi/91edumain+ltsp
--- debian-edu-install-2.12.8/lib/partman/recipes-amd64-efi/91edumain+ltsp
2023-01-30 14:09:03.000000000 +0100
+++
debian-edu-install-2.12.9~deb12u1/lib/partman/recipes-amd64-efi/91edumain+ltsp
2023-08-29 23:10:13.000000000 +0200
@@ -23,7 +23,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-17024 4000 20480 ext4
+18752 4000 22528 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-2.12.8/lib/partman/recipes-amd64-efi/92edumain+ws
debian-edu-install-2.12.9~deb12u1/lib/partman/recipes-amd64-efi/92edumain+ws
--- debian-edu-install-2.12.8/lib/partman/recipes-amd64-efi/92edumain+ws
2023-01-30 14:09:03.000000000 +0100
+++
debian-edu-install-2.12.9~deb12u1/lib/partman/recipes-amd64-efi/92edumain+ws
2023-08-29 23:10:13.000000000 +0200
@@ -15,7 +15,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+384 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-2.12.8/Makefile
debian-edu-install-2.12.9~deb12u1/Makefile
--- debian-edu-install-2.12.8/Makefile 2021-06-09 17:56:34.000000000 +0200
+++ debian-edu-install-2.12.9~deb12u1/Makefile 2023-08-29 23:10:13.000000000
+0200
@@ -36,6 +36,7 @@
common networked main-server workstation ltsp-server \
standalone ltsp-chroot
+.PHONY: all check install status dist clean profile-demo check-defaults
check-scripts install-partman-recipes minimum-diskreq
all: check
check: update-partman-recipes check-scripts # check-defaults
@@ -48,7 +49,6 @@
debian-edu-profile.templates: debian/debian-edu-profile-udeb.templates
(cd debian; po2debconf debian-edu-profile-udeb.templates) > $@
-.PHONY: profile-demo
profile-demo: debian-edu-profile.templates
chmod a+x ./debian-edu-profile
DEBIAN_FRONTEND=dialog DEBCONF_DEBUG=developer
/usr/share/debconf/frontend ./debian-edu-profile
@@ -81,15 +81,15 @@
minimum-diskreq:
@echo "Minimum disk requirements, in MiB:"
- @for profile in lib/partman/recipes*/* ; do \
- req=$$(grep '^[0-9]' $$profile |awk '{ sum=sum+$$1} END { print sum
}') ; \
- echo "$$req $$profile" ; \
+ @for profile in lib/partman/recipes*/[0-9]* ; do \
+ awk '$$1 ~ /^[0-9]/ { sum=sum+$$1} END { printf("%d\t%s\n", sum,
FILENAME) }' "$$profile" ; \
done
status:
for f in debian/po/*.po; do \
echo -n $$f:; LANG=C msgfmt --statistics -o /dev/null $$f 2>&1
; \
done
+
dist:
debuild -us -uc
diff -Nru debian-edu-install-2.12.8/README
debian-edu-install-2.12.9~deb12u1/README
--- debian-edu-install-2.12.8/README 2018-05-30 13:48:46.000000000 +0200
+++ debian-edu-install-2.12.9~deb12u1/README 2023-08-29 23:10:13.000000000
+0200
@@ -62,73 +62,95 @@
Profile main-server (90edumain):
- Partition amd64 DVD i386 CD i386 DVD i386 PXE
- 2013-07-14 2007-07-17 2013-09-26
+ Partition amd64 BD i386 CD i386 DVD i386 PXE
+ 2023-06-21 2013-07-14 2007-07-17 2013-09-26
------------------------------------------------------------------
- / 161 76 167
- /boot 35 18 24
- /usr 2526 535 2715
- /var 387 154 449
- /var/spool/squid 88 10 157
+ / 315 161 76 167
+ /boot 64 35 18 24
+ /boot/efi 6
+ /usr 2811 2526 535 2715
+ /var 314 387 154 449
+ /var/spool/squid 16 88 10 157
/skole/backup 35 35 69
/skole/tjener/home0 138 68 146
Profile main-server + thinclient-server (91edumain+ltsp):
- Partition amd64 CD i386 CD i386 DVD amd64 PXE
- 2014-10-08 2013-07-14 2007-10-24 2013-07-09
+ Partition amd64 BD amd64 CD i386 CD amd64 PXE
+ 2023-06-21 2014-10-08 2013-07-14 2013-07-09
-----------------------------------------------------------------
- / 285 170 80 197
- /boot 29 34 18 24
- /opt 8274 8209 516 8181
- /skole/backup 9 6 17 35
- /skole/tjener/home0 70 6 35 220
- /usr 8321 8088 3051 8000
- /var 662 3300 257 584
- /var/opt/ltsp/swapfiles 8 10 34 72
- /var/spool/squid 10 10 180
- /var/log 31
- /var/spool/squid 25
+ / 371 285 170 197
+ /boot 68 29 34 24
+ /boot/efi 6
+ /opt 8274 8209 8181
+ /skole/backup 9 6 35
+ /skole/tjener/home0 70 6 220
+ /srv/ltsp 7201
+ /srv/nfs4/home0
+ /usr 13082 8321 8088 8000
+ /var 455 662 3300 584
+ /var/opt/ltsp/swapfiles 8 10 72
+ /var/spool/squid 16 25 10 180
+ /var/log 31 31
+
+ Profile main-server + workstation + ltsp-server (91edumain+ltsp):
+
+ Partition amd64 BD
+ 2023-06-21
+ ------------------------------
+ / 371
+ /boot 68
+ /boot/efi 6
+ /usr 13082
+ /var 483
+ /var/log 32
+ /var/spool/squid 2
+ /skole/backup
+ /srv/ltsp 7201
+ /srv/nfs4/home0 21
Profile main-server + workstation (92edumain+ws):
- Partition amd64 DVD i386 CD amd64 CD
- 2013-07-14 2014-10-09
- ------------------------------------------------------
-
- / 170 263
- /boot 35 29
- /skole/backup 35 1
- /skole/tjener/home0 71 60
- /usr 8082 8308
- /var 623 642
- /var/spool/squid 84 17
+ Partition amd64 BD i386 CD amd64 CD
+ 2023-06-21 2013-07-14 2014-10-09
+ --------------------------------------------------------
+ / 328 170 263
+ /boot 67 35 29
+ /boot/efi 6 35 29
+ /skole/backup 35 1
+ /skole/tjener/home0 67 71 60
+ /usr 13489 8082 8308
+ /var 525 623 642
+ /var/spool/squid 16 84 17
Profile ltsp-server (94edultsp):
- Partition amd64 PXE i386 CD
- 2013-09-26 2013-07-14
- ---------------------------------------------
-
- / 215 183
- /boot 36 35
- /opt 8307 8209
- /usr 8078 7870
- /var >4461 >3168
- /var/opt/ltsp/swapfiles 72 11
+ Partition amd64 BD amd64 PXE i386 CD
+ 2023-06-21 2013-09-26 2013-07-14
+ ---------------------------------------------------------
+ / 24 215 183
+ /boot 68 36 35
+ /boot/efi 6
+ /opt 8307 8209
+ /usr 12389 8078 7870
+ /var 1918 >4461 >3168
+ /var/opt/ltsp/swapfiles 72 11
+ /var/log 29
+ /srv/ltsp
Profile workstation (96eduwork):
- Partition amd64 CD i386 CD i386 PXE
- 2014-10-10 2013-05-05 2014-10-14
+ Partition amd64 BD amd64 CD i386 PXE
+ 2023-06-21 2014-10-10 2014-10-14
------------------------------------------------------
- / 785 3387 515
- /boot 29 23 29
- /usr 8195 7748 6555
+ / 280 785 515
+ /boot 66 29 29
+ /boot/efi 6
+ /usr 12242 8195 6555
Profile standalone (98standalone):
- Partition amd64 DVD i386 CD i386 DVD powerpc CD
+ Partition amd64 DVD i386 CD i386 DVD powerpc CD
2014-10-10 2007-07-17 2008-10-04
------------------------------------------------------------------
/ 8037 306 1676
@@ -139,23 +161,25 @@
Profile roaming workstation (98edustandalone):
- Partition amd64 DVD i386 CD
- 2013-07-14
+ Partition amd64 BD i386 CD
+ 2023-06-21 2013-07-14
------------------------------------------
- / 7922
- /boot 35
- /var 596
+ / 12338 7922
+ /boot 66 35
+ /boot/efi 6
+ /var 299 596
/home 206
- Profile minimal (none):
+ Profile minimal (97minimal):
- Partition amd64 PXE amd64 CD i386 CD i386 DVD
- 2014-10-11 2013-12-12 2014-10-09
+ Partition amd64 BD amd64 PXE amd64 CD i386 CD
+ 2023-06-21 2014-10-11 2013-12-12 2014-10-09
------------------------------------------------------------------
- / 247 180 215
- /boot 29 33 29
- /var 215 864 236
- /usr 2305 2403 2407
+ / 10 247 180 215
+ /boot 66 29 33 29
+ /boot/efi 6
+ /var 10 215 864 236
+ /usr 1796 2305 2403 2407
Testing translations
====================
diff -Nru debian-edu-install-2.12.8/update-partman-recipes
debian-edu-install-2.12.9~deb12u1/update-partman-recipes
--- debian-edu-install-2.12.8/update-partman-recipes 2023-01-30
14:09:03.000000000 +0100
+++ debian-edu-install-2.12.9~deb12u1/update-partman-recipes 2023-08-29
23:10:13.000000000 +0200
@@ -1,2 +1,2 @@
-Last made update-partman-recipes Mon Jan 30 13:09:03 UTC 2023 for:
-91edumain+ltsp 94edultsp
+Last made update-partman-recipes Mi 21. Jun 13:49:21 CEST 2023 for:
+90edumain 91edumain+ltsp 92edumain+ws 96eduwork
