[debian-edu-commits] r79828 - in branches/wheezy/debian-edu-config: debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-04-28 07:19:48 +0000 (Sun, 28 Apr 2013)
New Revision: 79828

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/filesystems
Log:
Extend the filesystems test suite check to accept ext4 as well as
ext3 file system type.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-28 04:58:03 UTC (rev 79827)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-28 07:19:48 UTC (rev 79828)
@@ -4,6 +4,8 @@
   * Adjust wpad-extract to only accept http and https URLs from the
     proxy tool, to avoid direct:// style URLs that are useless as values
     of http_proxy and ftp_proxy.
+  * Extend the filesystems test suite check to accept ext4 as well as
+    ext3 file system type.
 
   [ Wolfgang Schweer ]
   * ltsp/init-ltsp.d/60-edu-diskless-ws: Add 'dhclient -nw' to fix the

Modified: branches/wheezy/debian-edu-config/testsuite/filesystems
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/filesystems	2013-04-28 04:58:03 UTC (rev 79827)
+++ branches/wheezy/debian-edu-config/testsuite/filesystems	2013-04-28 07:19:48 UTC (rev 79828)
@@ -10,14 +10,14 @@
 export LANG
 
 awk "/ext2/ { print \"error: $0: Using ext2 on\",\$2 }" /proc/mounts
-awk "/ext3/ { print \"success: $0: Using ext3 on\",\$2 }" /proc/mounts
+awk "/ext3|ext4/ { print \"success: $0: Using ext3 on\",\$2 }" /proc/mounts
 
 # Make sure all ext3 mount points are online resizable
-for p in `df -Pt ext3  | grep -v ^Filesystem |awk '{print $1}'`; do 
+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
 	:
     else
-	echo "error: $0: Missing resize_inode in ext3 fs $p"
+	echo "error: $0: Missing resize_inode in ext3/ext4 fs $p"
     fi
 done