From: Eric Sandeen <sandeen@sandeen.net>
Date: Fri, 26 Aug 2016 01:20:17 +0000 (+1000)
Subject: xfs_metadump: don't warn about unobfuscated log with -o
X-Git-Tag: v4.8.0-rc1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74642d8e2f514bd35715601c913e149285343808;p=thirdparty%2Fxfsprogs-dev.git

xfs_metadump: don't warn about unobfuscated log with -o

It makes no sense to warn about un-obfuscated logs
when we asked xfs_metadump to not obfuscate metadata:

# xfs_metadump -o /dev/loop2 bad.metadump
xfs_metadump: Filesystem log is dirty; image will contain unobfuscated metadata in log.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/db/metadump.c b/db/metadump.c
index 44359e18f..e82b660c7 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2649,12 +2649,14 @@ copy_log(void)
 		break;
 	case 1:
 		/* keep the dirty log */
-		print_warning(
+		if (obfuscate)
+			print_warning(
 _("Filesystem log is dirty; image will contain unobfuscated metadata in log."));
 		break;
 	case -1:
 		/* log detection error */
-		print_warning(
+		if (obfuscate)
+			print_warning(
 _("Could not discern log; image will contain unobfuscated metadata in log."));
 		break;
 	}