[debian-edu-commits] debian-edu/ 02/02: Reapplying commits ea7b4d7a106bd9e363919ddd8a078d4b313f4276, 38b3037cbff872fc2b2383ff7b76ac5f580c351f and 7fb2fa0c17fe02600e2f1c9ce1edcd2352c56b87 after documenting the 1.800 release.
Petter Reinholdtsen
pere at moszumanska.debian.org
Sun Sep 14 20:43:02 UTC 2014
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 885f8e14dd23453dc288fb3cc05c6b5b175e83c0
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Sun Sep 14 22:41:43 2014 +0200
Reapplying commits ea7b4d7a106bd9e363919ddd8a078d4b313f4276,
38b3037cbff872fc2b2383ff7b76ac5f580c351f and
7fb2fa0c17fe02600e2f1c9ce1edcd2352c56b87 after documenting
the 1.800 release.
---
cf/cf.apt | 2 --
debian/changelog | 11 +++++++++++
testsuite/filesystems | 9 +++++++++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/cf/cf.apt b/cf/cf.apt
index e114d8a..c335107 100644
--- a/cf/cf.apt
+++ b/cf/cf.apt
@@ -11,7 +11,6 @@ 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::
@@ -25,7 +24,6 @@ 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 bcf708c..5a23985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debian-edu-config (1.801) UNRELEASED; urgency=low
+
+ [ Wolfgang Schweer ]
+ * Drop local repo entry for 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> Sun, 14 Sep 2014 22:01:07 +0200
+
debian-edu-config (1.800) unstable; urgency=high
[ Petter Reinholdtsen ]
diff --git a/testsuite/filesystems b/testsuite/filesystems
index 88ac791..9da8d04 100755
--- a/testsuite/filesystems
+++ b/testsuite/filesystems
@@ -12,6 +12,15 @@ 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/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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list