xfs
[Top] [All Lists]

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

To: xfs-oss <xfs@xxxxxxxxxxx>
Subject: [PATCH] xfs_metadump: don't warn about unobfuscated log with -o
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Thu, 4 Aug 2016 10:51:12 -0500
Delivered-to: xfs@xxxxxxxxxxx
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.2.0
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@xxxxxxxxxx>
---

diff --git a/db/metadump.c b/db/metadump.c
index d7ff6e5..01a51c4 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2575,12 +2575,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;
        }

<Prev in Thread] Current Thread [Next in Thread>