Log Message:
-----------
* README: documentation updates.
* run-tests: support NFS v2, v3, and v4 mounts.
Tags:
----
LKML-branch
Modified Files:
--------------
unionfs/regression-2.0:
ChangeLog (r1.1.2.25 -> r1.1.2.26)
README (r1.1.2.3 -> r1.1.2.4)
brm.conf (r1.1.2.2 -> r1.1.2.3)
default.conf (r1.1.2.6 -> r1.1.2.7)
jffs2.conf (r1.1.2.2 -> r1.1.2.3)
nfs.conf (r1.1.2.2 -> r1.1.2.3)
run-tests (r1.1.2.11 -> r1.1.2.12)
thor.conf (r1.1.2.7 -> r1.1.2.8)
Revision Data
-------------
Index: default.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/default.conf,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lregression-2.0/default.conf -Lregression-2.0/default.conf -u -d -b -B -p
-r1.1.2.6 -r1.1.2.7
--- regression-2.0/default.conf
+++ regression-2.0/default.conf
@@ -40,7 +40,8 @@ DEV0=/dev/loop0
DEV1=/dev/loop1
DEV2=/dev/loop2
DEV3=/dev/loop3
-# name of file systems to format four device
+# Name of file systems to format your device. Supported file systems
+# include: ext2, ext3, xfs, reiserfs, nfs, nfs2, nfs3, nfs4, and jffs2.
FS0=ext2
FS1=ext2
FS2=ext2
Index: thor.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/thor.conf,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lregression-2.0/thor.conf -Lregression-2.0/thor.conf -u -d -b -B -p
-r1.1.2.7 -r1.1.2.8
--- regression-2.0/thor.conf
+++ regression-2.0/thor.conf
@@ -40,7 +40,8 @@ DEV0=/dev/.static/dev/loop0
DEV1=/dev/.static/dev/loop1
DEV2=/dev/.static/dev/loop2
DEV3=/dev/.static/dev/loop3
-# name of file systems to format four device
+# Name of file systems to format your device. Supported file systems
+# include: ext2, ext3, xfs, reiserfs, nfs, nfs2, nfs3, nfs4, and jffs2.
FS0=ext2
FS1=ext2
FS2=ext2
Index: jffs2.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/jffs2.conf,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/jffs2.conf -Lregression-2.0/jffs2.conf -u -d -b -B -p
-r1.1.2.2 -r1.1.2.3
--- regression-2.0/jffs2.conf
+++ regression-2.0/jffs2.conf
@@ -40,7 +40,8 @@ DEV0=/dev/loop0
DEV1=/dev/loop1
DEV2=/dev/loop2
DEV3=/dev/loop3
-# name of file systems to format four device
+# Name of file systems to format your device. Supported file systems
+# include: ext2, ext3, xfs, reiserfs, nfs, nfs2, nfs3, nfs4, and jffs2.
FS0=jffs2
FS1=ext2
FS2=ext2
Index: nfs.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/nfs.conf,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/nfs.conf -Lregression-2.0/nfs.conf -u -d -b -B -p
-r1.1.2.2 -r1.1.2.3
--- regression-2.0/nfs.conf
+++ regression-2.0/nfs.conf
@@ -40,7 +40,8 @@ DEV0=/dev/loop1
DEV1=/dev/loop2
DEV2=/dev/loop3
DEV3=/dev/loop4
-# name of file systems to format four device
+# Name of file systems to format your device. Supported file systems
+# include: ext2, ext3, xfs, reiserfs, nfs, nfs2, nfs3, nfs4, and jffs2.
FS0=nfs
FS1=nfs
FS2=nfs
Index: brm.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/brm.conf,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lregression-2.0/brm.conf -Lregression-2.0/brm.conf -u -d -b -B -p
-r1.1.2.2 -r1.1.2.3
--- regression-2.0/brm.conf
+++ regression-2.0/brm.conf
@@ -39,7 +39,8 @@ DEV0=/dev/loop1
DEV1=/dev/loop2
DEV2=/dev/loop3
DEV3=/dev/loop4
-# name of file systems to format four device
+# Name of file systems to format your device. Supported file systems
+# include: ext2, ext3, xfs, reiserfs, nfs, nfs2, nfs3, nfs4, and jffs2.
FS0=ext2
FS1=ext2
FS2=ext2
Index: ChangeLog
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/ChangeLog,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -Lregression-2.0/ChangeLog -Lregression-2.0/ChangeLog -u -d -b -B -p
-r1.1.2.25 -r1.1.2.26
--- regression-2.0/ChangeLog
+++ regression-2.0/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25 Erez Zadok <[EMAIL PROTECTED]>
+
+ * README: documentation updates.
+
+ * run-tests: support NFS v2, v3, and v4 mounts.
+
2007-05-23 Erez Zadok <[EMAIL PROTECTED]>
* *.conf: spell check.
Index: run-tests
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/run-tests,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -Lregression-2.0/run-tests -Lregression-2.0/run-tests -u -d -b -B -p
-r1.1.2.11 -r1.1.2.12
--- regression-2.0/run-tests
+++ regression-2.0/run-tests
@@ -89,13 +89,32 @@ function setup_lower
case "$fs" in
nfs* )
+ # figure out the NFS version, if any (default = NFSv3)
+ vers=`echo $fs | tr -dc [0-9]`
+ case "$vers" in
+ 2 | 3 )
+ versopt="-o nfsvers=$vers"
+ fs="nfs"
+ ;;
+ 4 )
+ versopt=""
+ ;;
+ * )
+ versopt=""
+ fs="nfs"
+ ;;
+ esac
basefs=ext2 # the base disk based f/s to export to NFS
runcmd mkfs -t $basefs -q $dev
runcmd mkdir -p /n/export/b$i
runcmd mount -t $basefs $dev /n/export/b$i
+ # nfsv4 needs an extra export command for the namespace root
+ if test "$fs" = "nfs4" ; then
+ runcmd exportfs -o no_root_squash,rw,insecure,fsid=0
localhost:/
+ fi
runcmd exportfs -o no_root_squash,rw localhost:/n/export/b$i
runcmd mkdir -p /n/lower/b$i
- runcmd mount -t $fs localhost:/n/export/b$i /n/lower/b$i
+ runcmd mount -t $fs $versopt localhost:/n/export/b$i
/n/lower/b$i
;;
jffs2 )
runcmd modprobe mtdblock
@@ -125,6 +144,9 @@ function do_umount
nfs* )
runcmd exportfs -u localhost:/n/export/b$branch
runcmd umount /n/export/b$branch
+ # nfsv4: extra unexport command
+ test "$fs" = "nfs4" && \
+ runcmd exportfs -u localhost:/
;;
jffs2 )
runcmd rmmod block2mtd
Index: README
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/README,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lregression-2.0/README -Lregression-2.0/README -u -d -b -B -p -r1.1.2.3
-r1.1.2.4
--- regression-2.0/README
+++ regression-2.0/README
@@ -1,16 +1,20 @@
- Unionfs 2.0 Regresssion Test Suite README
+ Unionfs 2.0 Regression Test Suite README
*****************************************
-Local Disk Tests (ext2, ext3, etc.)
------------------------------------
+Local File Systems Tests (tested with ext2, ext3, xfs, and reiserfs)
+--------------------------------------------------------------------
The current regression suite requires that you define four separate
local-disk devices, which WILL BE FORMATTED(!) by the regression suite
driver script. The four partitions will be formatted and mounted under
-/n/lower/b0, /n/lower/b1, /n/lower/b2, and /n/lower/b3.
+/n/lower/b0, /n/lower/b1, /n/lower/b2, and /n/lower/b3. You can define the
+partition's names and desired file system types to format as them with, in a
+special configuration file.
-You can define the partition's names and desired file system types to format
-as them with, in a special configuration file.
+You can also specify the device pathname as /dev/loop0, /dev/loop1, etc. In
+that case, the "run-tests" script will automatically create a small file
+system and format it as desired. We recommend you use loop devices, as it's
+much easier to create and destroy file systems using loop devices.
To run all the tests, execute
@@ -50,26 +54,27 @@ lower-level name that shouldn't appear,
##############################################################################
-### Jeff, is the stuff below still valid? Do we even *have* delete_all any
-### more?
-
NFS Tests
---------
-The procedure is similar to the above, except that the following variables are
-to be exported before running the tests:
+The procedure is similar to the above, except that the you can specify
+the file system name as follows
-export NFS=1
-export LOWER_DIR=/dhcp/nfs # This an NFS directory to test Unionfs on
+FS0=nfs # defaults to NFSv3
+FS1=nfs2 # NFSv2
+FS2=nfs3 # NFSv3
+FS3=nfs4 # NFSv4
-delete=all Tests
----------
-The procedure is similar to the above, except that you must have enabled the
-delete=all feature when you compiled the module and must export the following
-variable:
+For NFS tests, run-tests will format a loop device based file system with
+ext2, and export it to localhost.
-export DELETE_ALL=1
+##############################################################################
+JFFS2 Tests
+-----------
+If you specify the file system type as "jffs2", then "run-tests" will use a
+pre-built small jffs2 blank image, and mount it over the loop device in
+question. To get jffs2 to work, your kernel needs not just the JFFS2 file
+system, but also MTD device support.
##############################################################################
-
For more information, see <http://unionfs.filesystems.org/>
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
