[debian-edu-commits] [Git][debian-edu/debian-edu-install][master] 7 commits: Only show profiles in make minimum-diskreq
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Wed Jun 21 20:56:44 BST 2023
Mike Gabriel pushed to branch master at Debian Edu / debian-edu-install
Commits:
419ed9a9 by Guido Berhoerster at 2023-06-21T11:03:22+02:00
Only show profiles in make minimum-diskreq
Also shorten commands to only use awk.
- - - - -
4a75896b by Guido Berhoerster at 2023-06-21T14:57:05+02:00
Add partition size data for bullseye
- - - - -
65650aff by Guido Berhoerster at 2023-06-21T14:57:05+02:00
Properly declare phony targets in Makefile
- - - - -
ae92a53d by Guido Berhoerster at 2023-06-21T14:57:05+02:00
Increase partition sizes for main-server (90edumain)
Based on actual empirical data (amd64, see README).
- - - - -
cd8709a3 by Guido Berhoerster at 2023-06-21T14:57:05+02:00
Increase partition sizes for main-server + thinclient-server (91edumain+ltsp)
Based on actual empirical data (amd64, see README).
- - - - -
d6494368 by Guido Berhoerster at 2023-06-21T14:57:05+02:00
Increase partition sizes for main-server + workstation (92edumain+ws)
Based on actual empirical data (amd64, see README).
- - - - -
1fbb367f by Guido Berhoerster at 2023-06-21T14:57:05+02:00
Update after running 'make update-partman-recipes'
- - - - -
12 changed files:
- Makefile
- README
- lib/partman/common/90edumain
- lib/partman/common/91edumain+ltsp
- lib/partman/common/92edumain+ws
- lib/partman/recipes-amd64-efi/90edumain
- lib/partman/recipes-amd64-efi/91edumain+ltsp
- lib/partman/recipes-amd64-efi/92edumain+ws
- lib/partman/recipes/90edumain
- lib/partman/recipes/91edumain+ltsp
- lib/partman/recipes/92edumain+ws
- update-partman-recipes
Changes:
=====================================
Makefile
=====================================
@@ -36,6 +36,7 @@ DEFAULTS = \
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 @@ install:
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 @@ install-partman-recipes: update-partman-recipes
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
=====================================
README
=====================================
@@ -62,73 +62,95 @@ collected just after installation.
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 2028
+ /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 2735
+ /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 @@ collected just after installation.
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
====================
=====================================
lib/partman/common/90edumain
=====================================
@@ -10,7 +10,7 @@ debian-edu-install/text/partman-debian-edu-main ::
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+512 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -18,7 +18,7 @@ debian-edu-install/text/partman-debian-edu-main ::
filesystem{ ext4 }
mountpoint{ / } .
-3904 4000 8192 ext4
+4096 4000 8192 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
lib/partman/common/91edumain+ltsp
=====================================
@@ -18,7 +18,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
filesystem{ ext4 }
mountpoint{ / } .
-17024 4000 20480 ext4
+18752 4000 22528 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
lib/partman/common/92edumain+ws
=====================================
@@ -10,7 +10,7 @@ debian-edu-install/text/partman-debian-edu-main+ws ::
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+384 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
lib/partman/recipes-amd64-efi/90edumain
=====================================
@@ -15,7 +15,7 @@ debian-edu-install/text/partman-debian-edu-main ::
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+512 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -23,7 +23,7 @@ debian-edu-install/text/partman-debian-edu-main ::
filesystem{ ext4 }
mountpoint{ / } .
-3904 4000 8192 ext4
+4096 4000 8192 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
lib/partman/recipes-amd64-efi/91edumain+ltsp
=====================================
@@ -23,7 +23,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
filesystem{ ext4 }
mountpoint{ / } .
-17024 4000 20480 ext4
+18752 4000 22528 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
lib/partman/recipes-amd64-efi/92edumain+ws
=====================================
@@ -15,7 +15,7 @@ debian-edu-install/text/partman-debian-edu-main+ws ::
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+384 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
lib/partman/recipes/90edumain
=====================================
@@ -9,7 +9,7 @@ debian-edu-install/text/partman-debian-edu-main ::
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+512 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -17,7 +17,7 @@ debian-edu-install/text/partman-debian-edu-main ::
filesystem{ ext4 }
mountpoint{ / } .
-3904 4000 8192 ext4
+4096 4000 8192 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
lib/partman/recipes/91edumain+ltsp
=====================================
@@ -17,7 +17,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
filesystem{ ext4 }
mountpoint{ / } .
-17024 4000 20480 ext4
+18752 4000 22528 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
lib/partman/recipes/92edumain+ws
=====================================
@@ -9,7 +9,7 @@ debian-edu-install/text/partman-debian-edu-main+ws ::
filesystem{ ext2 }
mountpoint{ /boot } .
-256 10000 1024 ext4
+384 10000 1024 ext4
$lvmok{ }
method{ format }
format{ }
=====================================
update-partman-recipes
=====================================
@@ -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
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/compare/2d9ab90ef596b269a90b0d5d5b8e6ce99de044da...1fbb367f7959e617b3bf683ced6eb99e65940cb3
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/compare/2d9ab90ef596b269a90b0d5d5b8e6ce99de044da...1fbb367f7959e617b3bf683ced6eb99e65940cb3
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/20230621/97a55434/attachment-0001.htm>
More information about the debian-edu-commits
mailing list