[debian-edu-commits] debian-edu/ 01/02: Revert to the 1.800 code uploaded, to clean up me forgetting to push that code to git.debian.org.

[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-config.

commit 4b084d7ff83c9f1d5f94e264aa2732e1fa248174
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 14 22:35:09 2014 +0200

    Revert to the 1.800 code uploaded, to clean up me forgetting to push that code to git.debian.org.
---
 cf/cf.apt             |  2 ++
 debian/changelog      | 13 ++++++-------
 testsuite/filesystems | 26 ++++++++++++++++----------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/cf/cf.apt b/cf/cf.apt
index c335107..e114d8a 100644
--- a/cf/cf.apt
+++ b/cf/cf.apt
@@ -11,6 +11,7 @@ editfiles:
       AppendIfNoSuchLine "deb http://http.debian.net/debian jessie main contrib non-free"
       AppendIfNoSuchLine "### ftp based apt source: -----------------"
       AppendIfNoSuchLine "# deb ftp://ftp.debian.org/debian/ jessie main contrib non-free"
+      #AppendIfNoSuchLine "# deb ftp://ftp.skolelinux.org/skolelinux/ jessie local"
     }
 
   debian.ltspserver::
@@ -24,6 +25,7 @@ editfiles:
       AppendIfNoSuchLine "deb http://http.debian.net/debian jessie main contrib non-free"
       AppendIfNoSuchLine "### ftp based apt source: -----------------"
       AppendIfNoSuchLine "#deb ftp://ftp.debian.org/debian/ jessie main contrib non-free"
+      AppendIfNoSuchLine "#deb ftp://ftp.skolelinux.org/skolelinux/ jessie local"
     }
 
 shellcommands:
diff --git a/debian/changelog b/debian/changelog
index b434d9c..bcf708c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-config (1.800) UNRELEASED; urgency=low
+debian-edu-config (1.800) unstable; urgency=high
 
   [ Petter Reinholdtsen ]
   * Start on 1.800 as we are targeting Debian 8.
@@ -9,15 +9,14 @@ debian-edu-config (1.800) UNRELEASED; urgency=low
   * Fix a few typos in comments in
     ltsp-build-client/Debian-custom/032-edu-pkgs.
   * Fix typo in debian-edu-ltsp script, breaking when --arch is used.
+  * Add new testsuite check to check if /skole/tjener/home0
+    /skole/backup file systems have the acl and user_xattr options
+    enabled, to see if bug #638822 is present or not.
 
   [ Wolfgang Schweer ]
-  * Replace wheezy with jessie in cf/cf.apt and drop local repo entry.
+  * Replace wheezy with jessie in cf/cf.apt.
 
-  [ Jürgen Leibner ]
-  * Add check if the filesystems on the mountpoints support acls in the
-    testsuite filesystem.
-
- -- Petter Reinholdtsen <pere at debian.org>  Fri, 12 Sep 2014 09:20:57 +0200
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 14 Sep 2014 16:53:38 +0200
 
 debian-edu-config (1.727) unstable; urgency=high
 
diff --git a/testsuite/filesystems b/testsuite/filesystems
index bd0cf7b..88ac791 100755
--- a/testsuite/filesystems
+++ b/testsuite/filesystems
@@ -12,16 +12,7 @@ export LANG
 awk "/ext2/ { print \"error: $0: Using ext2 on\",\$2 }" /proc/mounts
 awk "/ext3|ext4/ { print \"success: $0: Using ext3 on\",\$2 }" /proc/mounts
 
-# Check if the filesystems on the mountpoints support acls
-for f in `grep 'ext' /proc/mounts|awk '{print $1}'`; do
-     if [ `chacl -l $f | grep 'cannot get'` ]; then
-        echo "error: $0: $f doesn't support acls" 
-     else
-        echo "success: $0: $f supports acls"
-     fi
-done
-
-# Make sure all ext3 mount points are online resizable
+# Make sure all ext3/ext4 mount points are online resizable
 for p in `(df -Pt ext3 2>/dev/null;df -Pt ext4 2>/dev/null) | grep -v ^Filesystem |awk '{print $1}'`; do 
     if tune2fs -l $p| grep features | grep -q resize_inode ; then
 	:
@@ -30,6 +21,21 @@ for p in `(df -Pt ext3 2>/dev/null;df -Pt ext4 2>/dev/null) | grep -v ^Filesyste
     fi
 done
 
+# Make sure home0 and backup have acl and user_xattr enabled
+# See bug #638822 is present or not.
+for dir in /skole/tjener/home0 /skole/backup; do
+    dev="$(LC_ALL=C df -P /var/log|awk '/%/ {print $1}')"
+    for opt in acl user_xattr ; do
+	if LC_ALL=C tune2fs -l "$dev" | \
+	    grep 'Default mount' | \
+	    grep -qw $opt ; then
+	    echo "success: $0: Found option $opt in $dir."
+	else
+	    echo "error: $0: Did not find option $opt in $dir."
+	fi
+    done
+done
+
 # Make sure autofs do not hide the real file systems
 if echo "$PROFILE" | grep -q Main-Server ; then
     if [ -d /skole/tjener/home0/lost+found ] ; then

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