mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Fixed general IRIX/Linux problems when running the -udf option.
Changed specific _scratch_xfs_mkfs to general _scratch_mkfs call.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
;;
|
||||
|
||||
+1
-1
@@ -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"
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user