From 2f83bf9f833750fd20bbd73f09110e4f4d409253 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 18 Jul 2018 13:22:11 +0200 Subject: [PATCH] Change wording of blkid signature messages. --- src/utils_tools.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/utils_tools.c b/src/utils_tools.c index e1b284d1..f2e4c033 100644 --- a/src/utils_tools.c +++ b/src/utils_tools.c @@ -433,17 +433,17 @@ int tools_wipe_progress(uint64_t size, uint64_t offset, void *usrptr) static void report_partition(const char *value, const char *device) { if (opt_batch_mode) - log_dbg("Detected '%s' partition signature on device %s.", value, device); + log_dbg("Device %s already contains a '%s' partition signature.", device, value); else - log_std(_("Detected '%s' partition signature on device %s.\n"), value, device); + log_std(_("WARNING: Device %s already contains a '%s' partition signature.\n"), device, value); } static void report_superblock(const char *value, const char *device) { if (opt_batch_mode) - log_dbg("Detected '%s' superblock signature on device %s.", value, device); + log_dbg("Device %s already contains a '%s' superblock signature.", device, value); else - log_std(_("Detected '%s' superblock signature on device %s.\n"), value, device); + log_std(_("WARNING: Device %s already contains a '%s' superblock signature.\n"), device, value); } int tools_detect_signatures(const char *device, int ignore_luks, size_t *count) @@ -508,7 +508,7 @@ int tools_wipe_all_signatures(const char *path) } if (stat(path, &st)) { - log_err(_("Failed to stat device %s. Disappeared?"), path); + log_err(_("Failed to stat device %s."), path); return -EINVAL; } @@ -537,10 +537,10 @@ int tools_wipe_all_signatures(const char *path) while ((pr = blk_probe(h)) < PRB_EMPTY) { if (blk_is_partition(h)) - log_verbose("Wiping '%s' partition signature from device %s.", + log_verbose("Existing '%s' partition signature on device %s will be wiped.", blk_get_partition_type(h), path); if (blk_is_superblock(h)) - log_verbose("Wiping '%s' superblock signature from device %s.", + log_verbose("Existing '%s' superblock signature on device %s will be wiped.", blk_get_superblock_type(h), path); if (blk_do_wipe(h)) { log_err(_("Failed to wipe device signature."));