xfstests: enable test 032 (mkfs overwrite) for btrfs
PATCH 1/1 xfstests: enable test 032 (mkfs overwrite) for btrfs
Now that btrfs has an "-f" arg, we can test that it doesn't improperly overwrite other filesystems in 032 like we do for xfs.
---
032 +10 -4
@@ -38,12 +38,18 @@ rm -f $seq.full . ./common.filter # real QA test starts here -_supported_fs xfs +_supported_fs xfs btrfs _supported_os Linux _require_nobigloopfs _require_scratch +# mkfs.btrfs did not have overwrite detection at first +if [ "$FSTYP" == "btrfs" ]; then + grep -q 'force overwrite' `echo $MKFS_BTRFS_PROG | awk '{print $1}'` || \ + _notrun "Installed mkfs.btrfs does not support -f option" +fi + echo "Silence is golden." for fs in `echo ${MKFS_PROG}.* | sed -e 's/.sbin.mkfs.//g'` do
@@ -61,7 +67,7 @@ do [ $fs = gfs2 ] && preop="echo y |" && preargs="-p lock_nolock -j 1" [ $fs = reiserfs ] && preop="echo y |" && preargs="-f" # cramfs mkfs requires a directory argument - [ $fs = cramfs ] && preargs=/proc/fs/xfs + [ $fs = cramfs ] && preargs=/proc/fs [ $fs = ext2 ] && preargs="-F" [ $fs = ext3 ] && preargs="-F" [ $fs = ext4 ] && preargs="-F"
@@ -77,8 +83,8 @@ do if [ $? -eq 0 ] ; then # next, ensure we don't overwrite it - echo "=== Attempting XFS overwrite of $fs..." >>$seq.full - ${MKFS_PROG}.xfs $SCRATCH_DEV >>$seq.full 2>&1 + echo "=== Attempting $FSTYP overwrite of $fs..." >>$seq.full + ${MKFS_PROG}.$FSTYP $SCRATCH_DEV >>$seq.full 2>&1 [ $? -eq 0 ] && echo "Failed - overwrote fs type ${fs}!" else
Eric,
Thanks once more for the patch. Once I finally got the correct version of mkfs.btrfs this looks good.
Interesting that the default make install of btrfs-progs did not install over my btrfsprogs rpm.
Was running SLES11 SP2 with btrfsprogs-0.19-5.31.1.x86_64.
It did not put mkfs.btrfs in /sbin. This did however, validate all the error paths ;).
--Rich
Quoted 53 lines · Eric Sandeen
Now that btrfs has an "-f" arg, we can test that it doesn't improperly overwrite other filesystems in 032 like we do for xfs.
Signed-off-by Eric Sandeen <[email protected]>---
032 +10
-4@@ -38,12 +38,18 @@ rm -f $seq.full . ./common.filter # real QA test starts here -_supported_fs xfs +_supported_fs xfs btrfs _supported_os Linux _require_nobigloopfs _require_scratch +# mkfs.btrfs did not have overwrite detection at first +if [ "$FSTYP" == "btrfs" ]; then + grep -q 'force overwrite' `echo $MKFS_BTRFS_PROG | awk '{print $1}'` || \ + _notrun "Installed mkfs.btrfs does not support -f option" +fi + echo "Silence is golden." for fs in `echo ${MKFS_PROG}.* | sed -e 's/.sbin.mkfs.//g'` do@@ -61,7 +67,7 @@ do [ $fs = gfs2 ] && preop="echo y |" && preargs="-p lock_nolock -j 1" [ $fs = reiserfs ] && preop="echo y |" && preargs="-f" # cramfs mkfs requires a directory argument - [ $fs = cramfs ] && preargs=/proc/fs/xfs + [ $fs = cramfs ] && preargs=/proc/fs [ $fs = ext2 ] && preargs="-F" [ $fs = ext3 ] && preargs="-F" [ $fs = ext4 ] && preargs="-F"@@ -77,8 +83,8 @@ do if [ $? -eq 0 ] ; then # next, ensure we don't overwrite it - echo "=== Attempting XFS overwrite of $fs..." >>$seq.full - ${MKFS_PROG}.xfs $SCRATCH_DEV >>$seq.full 2>&1 + echo "=== Attempting $FSTYP overwrite of $fs..." >>$seq.full + ${MKFS_PROG}.$FSTYP $SCRATCH_DEV >>$seq.full 2>&1 [ $? -eq 0 ] && echo "Failed - overwrote fs type ${fs}!" else
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Rich Johnston
Eric,
Thanks once more for the patch. Once I finally got the correct version of mkfs.btrfs this looks good.
Reviewed-by Rich Johnston <[email protected]>Interesting that the default make install of btrfs-progs did not install over my btrfsprogs rpm.
Was running SLES11 SP2 with btrfsprogs-0.19-5.31.1.x86_64.
It did not put mkfs.btrfs in /sbin. This did however, validate all the error paths ;).
Heh ;)
Well, mixing & matching upstream installs from source w/ rpm-packaged binaries is usually asking for trouble.
I don't think it's a bug, just bad administrative practice ;)
-Eric
Quoted 66 lines
--Rich
Quoted 58 lines · Eric Sandeen
Now that btrfs has an "-f" arg, we can test that it doesn't improperly overwrite other filesystems in 032 like we do for xfs.
Signed-off-by Eric Sandeen <[email protected]>---
032 +10
-4@@ -38,12 +38,18 @@ rm -f $seq.full . ./common.filter # real QA test starts here -_supported_fs xfs +_supported_fs xfs btrfs _supported_os Linux _require_nobigloopfs _require_scratch +# mkfs.btrfs did not have overwrite detection at first +if [ "$FSTYP" == "btrfs" ]; then + grep -q 'force overwrite' `echo $MKFS_BTRFS_PROG | awk '{print $1}'` || \ + _notrun "Installed mkfs.btrfs does not support -f option" +fi + echo "Silence is golden." for fs in `echo ${MKFS_PROG}.* | sed -e 's/.sbin.mkfs.//g'` do@@ -61,7 +67,7 @@ do [ $fs = gfs2 ] && preop="echo y |" && preargs="-p lock_nolock -j 1" [ $fs = reiserfs ] && preop="echo y |" && preargs="-f" # cramfs mkfs requires a directory argument - [ $fs = cramfs ] && preargs=/proc/fs/xfs + [ $fs = cramfs ] && preargs=/proc/fs [ $fs = ext2 ] && preargs="-F" [ $fs = ext3 ] && preargs="-F" [ $fs = ext4 ] && preargs="-F"@@ -77,8 +83,8 @@ do if [ $? -eq 0 ] ; then # next, ensure we don't overwrite it - echo "=== Attempting XFS overwrite of $fs..." >>$seq.full - ${MKFS_PROG}.xfs $SCRATCH_DEV >>$seq.full 2>&1 + echo "=== Attempting $FSTYP overwrite of $fs..." >>$seq.full + ${MKFS_PROG}.$FSTYP $SCRATCH_DEV >>$seq.full 2>&1 [ $? -eq 0 ] && echo "Failed - overwrote fs type ${fs}!" else_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 5 lines · Eric Sandeen
Quoted 2 lines
It did not put mkfs.btrfs in /sbin. This did however, validate all the error paths ;).
Heh ;)
Well, mixing & matching upstream installs from source w/ rpm-packaged binaries is usually asking for trouble. I don't think it's a bug, just bad administrative practice ;)
----
SuSE is moving most if not all of their boot-related binaries off of "/" and
putting
them in /usr, requiring that you either have 1 partition for / and /usr or you run their initrd that will pre-mount /usr on "/". Supposedly this is a requirement of moving the the MS-compat boot architecture, "systemd" and is being done by all the distros... (supposedly)... At least RedHat and SuSE are going that way...
It's great to boot up in single-user from your hard disk and be told mount
needs libs on a yet-to-be mounted partition...
;-/
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
This patch has been commited.
Thanks
--Rich
commit 99eb53da9c08148132cdf3cd401b248e6a0d96c5
Author: Eric Sandeen <[email protected]> Date: Wed Mar 13 16:01:00 2013 +0000
xfstests: enable test 032 (mkfs overwrite) for btrfs
Now that btrfs has an "-f" arg, we can test that it doesn't improperly overwrite other filesystems in 032 like we do for xfs.