From: ptools <ptools>
Date: Fri, 9 Jul 2004 04:04:14 +0000 (+0000)
Subject: Fixed general IRIX/Linux problems when running the -udf option.
X-Git-Tag: v1.1.0~815
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=af9fb020ce791173c38ff7a6dc7c1f059f41eedb;p=users%2Fhch%2Fxfstests-dev.git

Fixed general IRIX/Linux problems when running the -udf option.
Changed specific _scratch_xfs_mkfs to general _scratch_mkfs call.
---

diff --git a/check b/check
index ba98ea9fd..4d97229e7 100755
--- a/check
+++ b/check
@@ -171,14 +171,14 @@ MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
 EOF
 
 umount $SCRATCH_DEV 2>/dev/null
-# call the overridden mkfs.xfs - make sure the FS is built
+# call the overridden mkfs - make sure the FS is built
 # the same as we'll create it later.
 
-if ! _scratch_mkfs_xfs $flag >$tmp.err 2>&1
+if ! _scratch_mkfs $flag >$tmp.err 2>&1
 then
-    echo "our local _scratch_mkfs_xfs routine ..."
+    echo "our local _scratch_mkfs routine ..."
     cat $tmp.err
-    echo "check: failed to mkfs.xfs \$SCRATCH_DEV using specified options"
+    echo "check: failed to mkfs \$SCRATCH_DEV using specified options"
     exit 1
 fi
 
diff --git a/common b/common
index 736500aa5..225942f42 100644
--- a/common
+++ b/common
@@ -319,7 +319,7 @@ case "$FSTYP" in
 	 [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found" 
 	 ;;
     udf)
-	 [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf not found"
+	 [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
 	 ;;
     nfs)
 	 ;;
diff --git a/common.config b/common.config
index 43acb535d..63735098c 100644
--- a/common.config
+++ b/common.config
@@ -167,7 +167,7 @@ case "$HOSTOS" in
 	   ;;
     Linux)
 	   export MKFS_XFS_PROG="`set_prog_path mkfs.xfs`"
-	   export MKFS_UDF_PROG="`set_prog_path mkfs.udf`"
+	   export MKFS_UDF_PROG="`set_prog_path mkudffs`"
 	   export XFS_FSR_PROG="`set_prog_path xfs_fsr`"
 	   export MKFS_NFS_PROG="false" 
 	   ;;
diff --git a/common.rc b/common.rc
index d7b71b327..ce4254e88 100644
--- a/common.rc
+++ b/common.rc
@@ -187,7 +187,7 @@ _scratch_mkfs()
 	# do nothing for nfs
 	;;
     udf*)
-        $MKFS_PROG -t $FSTYP $MKFS_OPTIONS $* > /dev/null
+        $MKFS_UDF_PROG $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
 	;;
     *)
 	/sbin/mkfs -t $FSTYP $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null