eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-18 14:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change wording of blkid signature messages.

Browse Source
This commit is contained in:
Milan Broz
2018-07-18 13:22:11 +02:00
parent b2a1728201
commit 2f83bf9f83
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils_tools.c
View File

@@ -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) static void report_partition(const char *value, const char *device)
{ {
if (opt_batch_mode) 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 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) static void report_superblock(const char *value, const char *device)
{ {
if (opt_batch_mode) 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 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) 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)) { if (stat(path, &st)) {
log_err(_("Failed to stat device %s. Disappeared?"), path); log_err(_("Failed to stat device %s."), path);
return -EINVAL; return -EINVAL;
} }
@@ -537,10 +537,10 @@ int tools_wipe_all_signatures(const char *path)
while ((pr = blk_probe(h)) < PRB_EMPTY) { while ((pr = blk_probe(h)) < PRB_EMPTY) {
if (blk_is_partition(h)) 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); blk_get_partition_type(h), path);
if (blk_is_superblock(h)) 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); blk_get_superblock_type(h), path);
if (blk_do_wipe(h)) { if (blk_do_wipe(h)) {
log_err(_("Failed to wipe device signature.")); log_err(_("Failed to wipe device signature."));