mirror of
https://gitlab.com/cryptsetup/cryptsetup.git
synced 2025-12-20 15:20:07 +01:00
Asks offline reencryption confirmation only with image files.
If auto-detection fails for other reason just return the error. Users may now bypass active device auto-detection with --force-offline-reencrypt option.
This commit is contained in:
@@ -97,13 +97,15 @@ static int get_active_device_name(struct crypt_device *cd, const char *data_devi
|
|||||||
if (!ARG_SET(OPT_BATCH_MODE_ID))
|
if (!ARG_SET(OPT_BATCH_MODE_ID))
|
||||||
log_std(_("Auto-detected active dm device '%s' for data device %s.\n"), *r_active_name, data_device);
|
log_std(_("Auto-detected active dm device '%s' for data device %s.\n"), *r_active_name, data_device);
|
||||||
} else if (r < 0) {
|
} else if (r < 0) {
|
||||||
if (r == -ENOTBLK)
|
if (r != -ENOTBLK) {
|
||||||
log_std(_("Device %s is not a block device.\n"), data_device);
|
|
||||||
else
|
|
||||||
log_err(_("Failed to auto-detect device %s holders."), data_device);
|
log_err(_("Failed to auto-detect device %s holders."), data_device);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
r = -EINVAL;
|
r = -EINVAL;
|
||||||
if (!ARG_SET(OPT_BATCH_MODE_ID)) {
|
if (!ARG_SET(OPT_BATCH_MODE_ID)) {
|
||||||
|
log_std(_("Device %s is not a block device.\n"), data_device);
|
||||||
|
|
||||||
r = asprintf(&msg, _("Unable to decide if device %s is activated or not.\n"
|
r = asprintf(&msg, _("Unable to decide if device %s is activated or not.\n"
|
||||||
"Are you sure you want to proceed with reencryption in offline mode?\n"
|
"Are you sure you want to proceed with reencryption in offline mode?\n"
|
||||||
"It may lead to data corruption if the device is actually activated.\n"
|
"It may lead to data corruption if the device is actually activated.\n"
|
||||||
|
|||||||
Reference in New Issue
Block a user