From c0fbe33b3e36a8ff58c2352cc4e5324a44109be6 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 21 Sep 2015 13:06:18 +1000 Subject: [PATCH] xfs/077: fix test for userspace meta_uuid support The current _require_meta_uuid() test looks for a failure return code from xfs_db -x -c "uuid generate" but in fact this exits with success. (In fact uuid_f always exits with success; perhaps this needs fixing, but that's in the wild now). So grep for the string(s) stating that it failed, instead. Signed-off-by: Eric Sandeen Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- common/rc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/rc b/common/rc index 64732f1d..0049f6ec 100644 --- a/common/rc +++ b/common/rc @@ -2747,8 +2747,11 @@ _require_meta_uuid() # This will create a crc fs on $SCRATCH_DEV _require_xfs_crc - $XFS_DB_PROG -x -c "uuid generate" $SCRATCH_DEV >/dev/null 2>&1 \ - || _notrun "Userspace doesn't support meta_uuid feature" + $XFS_DB_PROG -x -c "uuid restore" $SCRATCH_DEV 2>&1 \ + | grep -q "invalid UUID\|supported on V5 fs" \ + && _notrun "Userspace doesn't support meta_uuid feature" + + $XFS_DB_PROG -x -c "uuid generate" $SCRATCH_DEV >/dev/null 2>&1 _scratch_mount >/dev/null 2>&1 \ || _notrun "Kernel doesn't support meta_uuid feature" -- 2.39.5