mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Fix merge issues.
Removed debug flag.
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user