[debian-edu-commits] [Git][debian-edu/debian-edu-install][master] 4 commits: version: Replace 11+edu0 with 12 as Debian bookworm is targeted

Wolfgang Schweer (@schweer-guest) gitlab at salsa.debian.org
Wed Sep 29 20:03:37 BST 2021



Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-install


Commits:
7e4c62fc by Wolfgang Schweer at 2021-09-29T20:41:26+02:00
version: Replace 11+edu0 with 12 as Debian bookworm is targeted

Adding 'edu0' doesn't make sense since official Debian ISO images are available

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
a93867a1 by Wolfgang Schweer at 2021-09-29T20:51:53+02:00
Adjust lib/partman/common/{91edumain+ltsp,94edultsp}

Increase both minimum and maximum values by ~20 GiB to have enough disk space for
both diskless workstation and thin client chroots, and also for related SquashFS
images in case these are generated.

Drop partition for mountpoint /var/opt/ltsp/swapfiles; the new LTSP doesn't
support NBD swap.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
3dda37f7 by Wolfgang Schweer at 2021-09-29T20:55:31+02:00
Add swapfile partion related item to d/changelog

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
9a87fae3 by Wolfgang Schweer at 2021-09-29T20:57:44+02:00
Update after running 'make update-partman-recipes'

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


9 changed files:

- debian/changelog
- lib/partman/common/91edumain+ltsp
- lib/partman/common/94edultsp
- lib/partman/recipes-amd64-efi/91edumain+ltsp
- lib/partman/recipes-amd64-efi/94edultsp
- lib/partman/recipes/91edumain+ltsp
- lib/partman/recipes/94edultsp
- update-partman-recipes
- version


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+debian-edu-install (2.12.2) UNRELEASED; urgency=medium
+
+  * version: Replace 11+edu0 with 12 as Debian bookworm is targeted. Adding
+     'edu0' doesn't make sense since official Debian ISO images are available.
+  * lib/partman/common/{91edumain+ltsp,94edultsp}:
+    - Increase both minimum and maximum values by ~20 GiB to have enough disk
+      space for both diskless workstation and thin client chroots, and also for
+      related SquashFS images in case these are generated.
+    - Drop partition for mountpoint /var/opt/ltsp/swapfiles; the new LTSP
+      doesn't support NBD swap.
+  * Update after running 'make update-partman-recipes'.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 29 Sep 2021 14:26:59 +0200
+
 debian-edu-install (2.12.1) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
lib/partman/common/91edumain+ltsp
=====================================
@@ -47,7 +47,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
 	$lvmok{ }
 	format{ } .
 
-12864 4000 18432 ext4
+32768 4000 38912 ext4
         $lvmok{ }
         method{ format }
         format{ }
@@ -55,14 +55,6 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
         filesystem{ ext4 }
         mountpoint{ /srv/ltsp } .
 
-128 2000 4096 ext4
-        $lvmok{ }
-        method{ format }
-        format{ }
-        use_filesystem{ }
-        filesystem{ ext4 }
-        mountpoint{ /var/opt/ltsp/swapfiles } .
-
 128 1500 32768 ext4
 	$lvmok{ }
 	method{ format }


=====================================
lib/partman/common/94edultsp
=====================================
@@ -42,7 +42,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /var/log } .
 
-12800 3000 16384 ext4
+32768 3000 38912 ext4
         $lvmok{ }
         method{ format }
 	format{ }
@@ -50,14 +50,6 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /srv/ltsp } .
 
-64 2000 4096 ext4
-        $lvmok{ }
-        method{ format }
-	format{ }
-	use_filesystem{ }
-	filesystem{ ext4 }
-	mountpoint{ /var/opt/ltsp/swapfiles } .
-
 64 10000 4096 linux-swap
 	method{ swap }
         $lvmok{ }


=====================================
lib/partman/recipes-amd64-efi/91edumain+ltsp
=====================================
@@ -52,7 +52,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
 	$lvmok{ }
 	format{ } .
 
-12864 4000 18432 ext4
+32768 4000 38912 ext4
         $lvmok{ }
         method{ format }
         format{ }
@@ -60,14 +60,6 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
         filesystem{ ext4 }
         mountpoint{ /srv/ltsp } .
 
-128 2000 4096 ext4
-        $lvmok{ }
-        method{ format }
-        format{ }
-        use_filesystem{ }
-        filesystem{ ext4 }
-        mountpoint{ /var/opt/ltsp/swapfiles } .
-
 128 1500 32768 ext4
 	$lvmok{ }
 	method{ format }


=====================================
lib/partman/recipes-amd64-efi/94edultsp
=====================================
@@ -47,7 +47,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /var/log } .
 
-12800 3000 16384 ext4
+32768 3000 38912 ext4
         $lvmok{ }
         method{ format }
 	format{ }
@@ -55,14 +55,6 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /srv/ltsp } .
 
-64 2000 4096 ext4
-        $lvmok{ }
-        method{ format }
-	format{ }
-	use_filesystem{ }
-	filesystem{ ext4 }
-	mountpoint{ /var/opt/ltsp/swapfiles } .
-
 64 10000 4096 linux-swap
 	method{ swap }
         $lvmok{ }


=====================================
lib/partman/recipes/91edumain+ltsp
=====================================
@@ -46,7 +46,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
 	$lvmok{ }
 	format{ } .
 
-12864 4000 18432 ext4
+32768 4000 38912 ext4
         $lvmok{ }
         method{ format }
         format{ }
@@ -54,14 +54,6 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
         filesystem{ ext4 }
         mountpoint{ /srv/ltsp } .
 
-128 2000 4096 ext4
-        $lvmok{ }
-        method{ format }
-        format{ }
-        use_filesystem{ }
-        filesystem{ ext4 }
-        mountpoint{ /var/opt/ltsp/swapfiles } .
-
 128 1500 32768 ext4
 	$lvmok{ }
 	method{ format }


=====================================
lib/partman/recipes/94edultsp
=====================================
@@ -41,7 +41,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /var/log } .
 
-12800 3000 16384 ext4
+32768 3000 38912 ext4
         $lvmok{ }
         method{ format }
 	format{ }
@@ -49,14 +49,6 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /srv/ltsp } .
 
-64 2000 4096 ext4
-        $lvmok{ }
-        method{ format }
-	format{ }
-	use_filesystem{ }
-	filesystem{ ext4 }
-	mountpoint{ /var/opt/ltsp/swapfiles } .
-
 64 10000 4096 linux-swap
 	method{ swap }
         $lvmok{ }


=====================================
update-partman-recipes
=====================================
@@ -1,2 +1,2 @@
-Last made update-partman-recipes Di 8. Jun 23:24:54 CEST 2021 for:
-90edumain 91edumain+ltsp 92edumain+ws 94edultsp 96eduwork 97minimal 98edustandalone recipes-amd64-efi-specific
+Last made update-partman-recipes Mi 29. Sep 20:46:51 CEST 2021 for:
+91edumain+ltsp 94edultsp


=====================================
version
=====================================
@@ -1 +1 @@
-11+edu0
+12



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/compare/40c8bd30810cccc50237240a353d4c948bc790f1...9a87fae343a1ec144c7af9c656812fed4c853f92

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/compare/40c8bd30810cccc50237240a353d4c948bc790f1...9a87fae343a1ec144c7af9c656812fed4c853f92
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/20210929/381aa175/attachment-0001.htm>


More information about the debian-edu-commits mailing list