[debian-edu-commits] debian-edu/ 01/01: squid renaming: adjust all recipies.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-install.

commit 38f24f342c1933b019a3ec8991db8013f21b630b
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Apr 21 21:24:08 2016 +0200

    squid renaming: adjust all recipies.
---
 README                                                       | 2 +-
 lib/partman/common/90edumain                                 | 2 +-
 lib/partman/common/91edumain+ltsp                            | 2 +-
 lib/partman/common/92edumain+ws                              | 2 +-
 lib/partman/recipes-powerpc-powermac_newworld/90edumain      | 2 +-
 lib/partman/recipes-powerpc-powermac_newworld/91edumain+ltsp | 2 +-
 lib/partman/recipes-powerpc-powermac_newworld/92edumain+ws   | 2 +-
 lib/partman/recipes-powerpc-prep/90edumain                   | 2 +-
 lib/partman/recipes-powerpc-prep/91edumain+ltsp              | 2 +-
 lib/partman/recipes-powerpc-prep/92edumain+ws                | 2 +-
 lib/partman/recipes/90edumain                                | 2 +-
 lib/partman/recipes/92edumain+ws                             | 2 +-
 update-partman-recipes                                       | 4 ++--
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README b/README
index 6f900b2..a628da6 100644
--- a/README
+++ b/README
@@ -88,7 +88,7 @@ collected just after installation.
   /var/opt/ltsp/swapfiles      8          10          34          72
   /var/spool/squid                        10          10         180
   /var/log                    31
-  /var/spool/squid3           25
+  /var/spool/squid            25
 
   Profile main-server + workstation (92edumain+ws):
 
diff --git a/lib/partman/common/90edumain b/lib/partman/common/90edumain
index c44049a..4e35b2e 100644
--- a/lib/partman/common/90edumain
+++ b/lib/partman/common/90edumain
@@ -54,7 +54,7 @@ debian-edu-install/text/partman-debian-edu-main ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/common/91edumain+ltsp b/lib/partman/common/91edumain+ltsp
index bc0c4ff..2c0e7b0 100644
--- a/lib/partman/common/91edumain+ltsp
+++ b/lib/partman/common/91edumain+ltsp
@@ -80,7 +80,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/common/92edumain+ws b/lib/partman/common/92edumain+ws
index aa2f453..fb21a95 100644
--- a/lib/partman/common/92edumain+ws
+++ b/lib/partman/common/92edumain+ws
@@ -54,7 +54,7 @@ debian-edu-install/text/partman-debian-edu-main+ws ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/recipes-powerpc-powermac_newworld/90edumain b/lib/partman/recipes-powerpc-powermac_newworld/90edumain
index eb7de47..d22f786 100644
--- a/lib/partman/recipes-powerpc-powermac_newworld/90edumain
+++ b/lib/partman/recipes-powerpc-powermac_newworld/90edumain
@@ -58,7 +58,7 @@ debian-edu-install/text/partman-debian-edu-main ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/recipes-powerpc-powermac_newworld/91edumain+ltsp b/lib/partman/recipes-powerpc-powermac_newworld/91edumain+ltsp
index 9e933cc..e49ae36 100644
--- a/lib/partman/recipes-powerpc-powermac_newworld/91edumain+ltsp
+++ b/lib/partman/recipes-powerpc-powermac_newworld/91edumain+ltsp
@@ -84,7 +84,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/recipes-powerpc-powermac_newworld/92edumain+ws b/lib/partman/recipes-powerpc-powermac_newworld/92edumain+ws
index f288d23..d7d8f83 100644
--- a/lib/partman/recipes-powerpc-powermac_newworld/92edumain+ws
+++ b/lib/partman/recipes-powerpc-powermac_newworld/92edumain+ws
@@ -58,7 +58,7 @@ debian-edu-install/text/partman-debian-edu-main+ws ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/recipes-powerpc-prep/90edumain b/lib/partman/recipes-powerpc-prep/90edumain
index e31b40e..cfa49a9 100644
--- a/lib/partman/recipes-powerpc-prep/90edumain
+++ b/lib/partman/recipes-powerpc-prep/90edumain
@@ -58,7 +58,7 @@ debian-edu-install/text/partman-debian-edu-main ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/recipes-powerpc-prep/91edumain+ltsp b/lib/partman/recipes-powerpc-prep/91edumain+ltsp
index 57430c9..d4c868b 100644
--- a/lib/partman/recipes-powerpc-prep/91edumain+ltsp
+++ b/lib/partman/recipes-powerpc-prep/91edumain+ltsp
@@ -84,7 +84,7 @@ debian-edu-install/text/partman-debian-edu-main+ltsp ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/recipes-powerpc-prep/92edumain+ws b/lib/partman/recipes-powerpc-prep/92edumain+ws
index dafe3b6..4bec32d 100644
--- a/lib/partman/recipes-powerpc-prep/92edumain+ws
+++ b/lib/partman/recipes-powerpc-prep/92edumain+ws
@@ -58,7 +58,7 @@ debian-edu-install/text/partman-debian-edu-main+ws ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/recipes/90edumain b/lib/partman/recipes/90edumain
index c92194d..157fb5b 100644
--- a/lib/partman/recipes/90edumain
+++ b/lib/partman/recipes/90edumain
@@ -53,7 +53,7 @@ debian-edu-install/text/partman-debian-edu-main ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/recipes/92edumain+ws b/lib/partman/recipes/92edumain+ws
index 956e9f9..cf2e957 100644
--- a/lib/partman/recipes/92edumain+ws
+++ b/lib/partman/recipes/92edumain+ws
@@ -53,7 +53,7 @@ debian-edu-install/text/partman-debian-edu-main+ws ::
         format{ }
         use_filesystem{ }
         filesystem{ ext4 }
-        mountpoint{ /var/spool/squid3 } .
+        mountpoint{ /var/spool/squid } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/update-partman-recipes b/update-partman-recipes
index 0ba4637..145619d 100644
--- a/update-partman-recipes
+++ b/update-partman-recipes
@@ -1,2 +1,2 @@
-Last made update-partman-recipes fr. 10. okt. 09:30:47 +0200 2014 for:
-98edustandalone
+Last made update-partman-recipes Do 21. Apr 21:11:33 CEST 2016 for:
+91edumain+ltsp 92edumain+ws 90edumain

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git