[debian-edu-commits] debian-edu/ 02/03: Adjust partitioning setup for squid3, create /var/spool/squid3/, not /var/spool/squid/.

[Petter Reinholdtsen]

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

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

commit 985d5ec0b25662bc5703d81fc37d6e7500847bdb
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Oct 3 14:18:14 2014 +0200

    Adjust partitioning setup for squid3, create /var/spool/squid3/, not /var/spool/squid/.
---
 debian/changelog                  | 2 ++
 lib/partman/common/90edumain      | 2 +-
 lib/partman/common/91edumain+ltsp | 2 +-
 lib/partman/common/92edumain+ws   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 899755b..1d7bdab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 debian-edu-install (1.806) UNRELEASED; urgency=low
 
   * Not using eatmydata is a warning, not an error.
+  * Adjust partitioning setup for squid3, create /var/spool/squid3/, not
+    /var/spool/squid/.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 03 Oct 2014 14:17:08 +0200
 
diff --git a/lib/partman/common/90edumain b/lib/partman/common/90edumain
index d899671..edee3e4 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/squid } .
+        mountpoint{ /var/spool/squid3 } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/common/91edumain+ltsp b/lib/partman/common/91edumain+ltsp
index 92eef6f..1c81ad1 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/squid } .
+        mountpoint{ /var/spool/squid3 } .
 
 64 1000 32768 ext4
         $lvmok{ }
diff --git a/lib/partman/common/92edumain+ws b/lib/partman/common/92edumain+ws
index 6834841..3c49177 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/squid } .
+        mountpoint{ /var/spool/squid3 } .
 
 64 1000 32768 ext4
         $lvmok{ }

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