Fix merge issues.

Removed debug flag.
This commit is contained in:
ptools
2004-06-16 05:38:57 +00:00
parent f75038534f
commit 7facbfb74b
6 changed files with 42 additions and 81 deletions
-13
View File
@@ -162,9 +162,7 @@ if [ $os == "linux" ]; then
FULL_FSTYP_DETAILS=`_full_fstyp_details`
FULL_HOST_DETAILS=`_full_platform_details`
FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
FULL_MOUNT_OPTIONS=`_scratch_mount_options`
cat <<EOF
@@ -181,17 +179,6 @@ if [ $os == "linux" ]; then
flag='-f'
fi
echo "MKFS_OPTIONS -- $FULL_MKFS_OPTIONS"
FULL_MOUNT_OPTIONS=`_scratch_mount_options`
cat <<EOF
FSTYP -- $FULL_FSTYP_DETAILS
PLATFORM -- $FULL_HOST_DETAILS
MKFS_OPTIONS -- $FULL_MKFS_OPTIONS
MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
EOF
umount $SCRATCH_DEV 2>/dev/null
# call the overridden mkfs.xfs - make sure the FS is built
# the same as we'll create it later.