From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Mon, 1 Oct 2007 05:06:36 +0000 (-0400)
Subject: Support 2.6.9's older style blkmtd driver.
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=34663974387a06245ecd3cb45a965c109f50b611;p=unionfs-regression.git

Support 2.6.9's older style blkmtd driver.
---

diff --git a/run-tests b/run-tests
index 513600f..d8a4874 100755
--- a/run-tests
+++ b/run-tests
@@ -117,7 +117,14 @@ function setup_lower
 		;;
 	    jffs2 )
 		runcmd modprobe mtdblock
-		runcmd modprobe block2mtd block2mtd=$dev,128ki
+		case "`uname -r`" in
+		    2.6.9* )
+			runcmd modprobe blkmtd device=$dev,128ki
+			;;
+		    * )
+			runcmd modprobe block2mtd block2mtd=$dev,128ki
+			;;
+		esac
 		runcmd sync	# work around race bug in block2mtd
 		runcmd mount -t $fs /dev/mtdblock$i /n/lower/b$i
 		;;
@@ -238,7 +245,7 @@ do
   if test -f $t
   then
       test -n "$OUTPUT_COLOR" && echo -e -n "\033[${OUTPUT_COLOR}m"
-      echo "TEST: $t (FS=${MYFS:-default})"
+      echo "TEST: $t (FS=${MYFS:-default} KERNEL=`uname -r`)"
       test -n "$OUTPUT_COLOR" && echo -e -n "\033[m"
   else
       echo "no such test script $t"