Wolfgang Schweer · Wolfgang Schweer · Wolfgang Schweer · 3c4c675f · 3c4c675f · 3c4c675f
--- a/debian-edu-profile
+++ b/debian-edu-profile
@@ -327,7 +327,7 @@ automatic_partitioning() {
        db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/91edumain+ltsp

        # Configure slbackup here in case we have a combo server installation
-        add_preseed slbackup slbackup/client_location string "/etc /skole/tjener/home0 /opt/ltsp/i386/etc /var/backups"
+        add_preseed slbackup slbackup/client_location string "/etc /skole/tjener/home0 /var/backups"
        ;;
    "true-true-false-false-false-false") # mainserver & workstation
        log "Preseeding partman for Combo Main-Server and Workstation"
@@ -457,10 +457,10 @@ set_mirror_info

 archstr=$(/bin/archdetect)
 if [ -f /cdrom/.disk/cd_type ] && egrep -iq 'dvd|bluray' /cdrom/.disk/cd_type; then
-    #disable mirror usage if we install from dvd or the usb sticks
+    #disable mirror usage if we install from a BD image
    db_set "apt-setup/use_mirror" false
    db_fset "apt-setup/use_mirror" seen true || true
-    log "disabling mirror selection on dvd's"
+    log "disabling mirror selection on BD image"
 elif ! log-output wget -U "Wget, Debian Edu d-i $DISTRIBUTION $archstr" -qO - http://deb.debian.org/debian/README && \
    ! log-output wget --no-proxy -U "Wget, Debian Edu d-i $DISTRIBUTION $archstr" -qO - http://deb.debian.org/debian/README ; then
    db_settitle debian-edu-install/no-network/title

--- a/debian/changelog
+++ b/debian/changelog
+debian-edu-install (2.11.4) UNRELEASED; urgency=medium
+
+  * debian-edu-profile:
+    - Remove LTSP related location from slbackup preseeding.
+    - Update comment concerning offline installation media.
+  * Adjust partition sizes now that LTSP uses /srv/ltsp instead of /opt/ltsp to
+    store images/thin client chroots and /srv/tftp to store kernels and initrds:
+    - lib/partman/common/{91edumain+ltsp,94edultsp}:
+      + Replace mountpoint /opt with /srv/ltsp.
+      + Add 512 MiB to / (to have enough space for /srv/tftp).
+      + Use 15 GiB less for /srv/ltsp (fat client chroots are gone, the image
+        is now built from the server filesystem).
+  * Update after running 'make update-partman-recipes'.
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Tue, 21 Jan 2020 15:33:15 +0100
+
 debian-edu-install (2.11.3) unstable; urgency=medium

  [ Wolfgang Schweer ]

--- a/lib/partman/common/91edumain+ltsp
+++ b/lib/partman/common/91edumain+ltsp
@@ -11,7 +11,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
        filesystem{ ext4 }
        mountpoint{ /boot } .

-128 10000 1024 ext4
+640 10000 1536 ext4
 	$lvmok{ }
 	method{ format }
 	format{ }
@@ -48,13 +48,13 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
 	$lvmok{ }
 	format{ } .

-23104 4000 28672 ext4
+7744 4000 13312 ext4
        $lvmok{ }
        method{ format }
        format{ }
        use_filesystem{ }
        filesystem{ ext4 }
-        mountpoint{ /opt } .
+        mountpoint{ /srv/ltsp } .

 128 2000 4096 ext4
        $lvmok{ }

--- a/lib/partman/common/94edultsp
+++ b/lib/partman/common/94edultsp
@@ -11,7 +11,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
        filesystem{ ext4 }
        mountpoint{ /boot } .

-512 10000 2048 ext4
+1024 10000 2560 ext4
        $lvmok{ }
 	method{ format }
 	format{ }
@@ -43,13 +43,13 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /var/log } .

-23040 3000 26624 ext4
+7680 3000 11264 ext4
        $lvmok{ }
        method{ format }
 	format{ }
 	use_filesystem{ }
 	filesystem{ ext4 }
-	mountpoint{ /opt } .
+	mountpoint{ /srv/ltsp } .

 64 2000 4096 ext4
        $lvmok{ }

--- a/lib/partman/recipes-powerpc-powermac_newworld/91edumain+ltsp
+++ b/lib/partman/recipes-powerpc-powermac_newworld/91edumain+ltsp
@@ -15,7 +15,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
        filesystem{ ext4 }
        mountpoint{ /boot } .

-128 10000 1024 ext4
+640 10000 1536 ext4
 	$lvmok{ }
 	method{ format }
 	format{ }
@@ -52,13 +52,13 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
 	$lvmok{ }
 	format{ } .

-23104 4000 28672 ext4
+7744 4000 13312 ext4
        $lvmok{ }
        method{ format }
        format{ }
        use_filesystem{ }
        filesystem{ ext4 }
-        mountpoint{ /opt } .
+        mountpoint{ /srv/ltsp } .

 128 2000 4096 ext4
        $lvmok{ }

--- a/lib/partman/recipes-powerpc-powermac_newworld/94edultsp
+++ b/lib/partman/recipes-powerpc-powermac_newworld/94edultsp
@@ -15,7 +15,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
        filesystem{ ext4 }
        mountpoint{ /boot } .

-512 10000 2048 ext4
+1024 10000 2560 ext4
        $lvmok{ }
 	method{ format }
 	format{ }
@@ -47,13 +47,13 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /var/log } .

-23040 3000 26624 ext4
+7680 3000 11264 ext4
        $lvmok{ }
        method{ format }
 	format{ }
 	use_filesystem{ }
 	filesystem{ ext4 }
-	mountpoint{ /opt } .
+	mountpoint{ /srv/ltsp } .

 64 2000 4096 ext4
        $lvmok{ }

--- a/lib/partman/recipes-powerpc-prep/91edumain+ltsp
+++ b/lib/partman/recipes-powerpc-prep/91edumain+ltsp
@@ -15,7 +15,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
        filesystem{ ext4 }
        mountpoint{ /boot } .

-128 10000 1024 ext4
+640 10000 1536 ext4
 	$lvmok{ }
 	method{ format }
 	format{ }
@@ -52,13 +52,13 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
 	$lvmok{ }
 	format{ } .

-23104 4000 28672 ext4
+7744 4000 13312 ext4
        $lvmok{ }
        method{ format }
        format{ }
        use_filesystem{ }
        filesystem{ ext4 }
-        mountpoint{ /opt } .
+        mountpoint{ /srv/ltsp } .

 128 2000 4096 ext4
        $lvmok{ }

--- a/lib/partman/recipes-powerpc-prep/94edultsp
+++ b/lib/partman/recipes-powerpc-prep/94edultsp
@@ -15,7 +15,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
        filesystem{ ext4 }
        mountpoint{ /boot } .

-512 10000 2048 ext4
+1024 10000 2560 ext4
        $lvmok{ }
 	method{ format }
 	format{ }
@@ -47,13 +47,13 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /var/log } .

-23040 3000 26624 ext4
+7680 3000 11264 ext4
        $lvmok{ }
        method{ format }
 	format{ }
 	use_filesystem{ }
 	filesystem{ ext4 }
-	mountpoint{ /opt } .
+	mountpoint{ /srv/ltsp } .

 64 2000 4096 ext4
        $lvmok{ }

--- a/lib/partman/recipes/91edumain+ltsp
+++ b/lib/partman/recipes/91edumain+ltsp
@@ -10,7 +10,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
        filesystem{ ext4 }
        mountpoint{ /boot } .

-128 10000 1024 ext4
+640 10000 1536 ext4
 	$lvmok{ }
 	method{ format }
 	format{ }
@@ -47,13 +47,13 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
 	$lvmok{ }
 	format{ } .

-23104 4000 28672 ext4
+7744 4000 13312 ext4
        $lvmok{ }
        method{ format }
        format{ }
        use_filesystem{ }
        filesystem{ ext4 }
-        mountpoint{ /opt } .
+        mountpoint{ /srv/ltsp } .

 128 2000 4096 ext4
        $lvmok{ }

--- a/lib/partman/recipes/94edultsp
+++ b/lib/partman/recipes/94edultsp
@@ -10,7 +10,7 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
        filesystem{ ext4 }
        mountpoint{ /boot } .

-512 10000 2048 ext4
+1024 10000 2560 ext4
        $lvmok{ }
 	method{ format }
 	format{ }
@@ -42,13 +42,13 @@ debian-edu-install/text/partman-debian-edu-ltsp ::
 	filesystem{ ext4 }
 	mountpoint{ /var/log } .

-23040 3000 26624 ext4
+7680 3000 11264 ext4
        $lvmok{ }
        method{ format }
 	format{ }
 	use_filesystem{ }
 	filesystem{ ext4 }
-	mountpoint{ /opt } .
+	mountpoint{ /srv/ltsp } .

 64 2000 4096 ext4
        $lvmok{ }

--- a/update-partman-recipes
+++ b/update-partman-recipes
-Last made update-partman-recipes Di 13. Feb 13:22:44 CET 2018 for:
-91edumain+ltsp 92edumain+ws 96eduwork 98edustandalone 94edultsp
+Last made update-partman-recipes Tue Jan 21 16:36:47 CET 2020 for:
+91edumain+ltsp