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:
ptools
2004-07-09 04:04:14 +00:00
parent 04caa29aa4
commit af9fb020ce
4 changed files with 7 additions and 7 deletions
+4 -4
View File
@@ -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
+1 -1
View File
@@ -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
View File
@@ -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"
;;
+1 -1
View File
@@ -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