]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_metadump: don't warn about unobfuscated log with -o
authorEric Sandeen <sandeen@sandeen.net>
Fri, 26 Aug 2016 01:20:17 +0000 (11:20 +1000)
committerDave Chinner <david@fromorbit.com>
Fri, 26 Aug 2016 01:20:17 +0000 (11:20 +1000)
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>
db/metadump.c

index 44359e18f8211e14f88a0023024b5f89b2d799fb..e82b660c70a0b3eedfb61ffe216870795af912db 100644 (file)
@@ -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;
        }