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

Print error message if device exists but as other subsystem.

Browse Source
This commit is contained in:
Milan Broz
2017-07-26 10:53:29 +02:00
parent 6f2ff93519
commit 962bf58f8f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/setup.c
View File

@@ -2047,9 +2047,10 @@ int crypt_activate_by_passphrase(struct crypt_device *cd,
if (name) { if (name) {
ci = crypt_status(NULL, name); ci = crypt_status(NULL, name);
if (ci == CRYPT_INVALID) if (ci == CRYPT_INVALID) {
log_err(cd, _("Cannot use device %s, name is invalid or still in use.\n"), name);
return -EINVAL; return -EINVAL;
else if (ci >= CRYPT_ACTIVE) { } else if (ci >= CRYPT_ACTIVE) {
log_err(cd, _("Device %s already exists.\n"), name); log_err(cd, _("Device %s already exists.\n"), name);
return -EEXIST; return -EEXIST;
} }
@@ -2104,9 +2105,10 @@ int crypt_activate_by_keyfile_offset(struct crypt_device *cd,
if (name) { if (name) {
ci = crypt_status(NULL, name); ci = crypt_status(NULL, name);
if (ci == CRYPT_INVALID) if (ci == CRYPT_INVALID) {
log_err(cd, _("Cannot use device %s, name is invalid or still in use.\n"), name);
return -EINVAL; return -EINVAL;
else if (ci >= CRYPT_ACTIVE) { } else if (ci >= CRYPT_ACTIVE) {
log_err(cd, _("Device %s already exists.\n"), name); log_err(cd, _("Device %s already exists.\n"), name);
return -EEXIST; return -EEXIST;
} }
@@ -2198,9 +2200,10 @@ int crypt_activate_by_volume_key(struct crypt_device *cd,
if (name) { if (name) {
ci = crypt_status(NULL, name); ci = crypt_status(NULL, name);
if (ci == CRYPT_INVALID) if (ci == CRYPT_INVALID) {
log_err(cd, _("Cannot use device %s, name is invalid or still in use.\n"), name);
return -EINVAL; return -EINVAL;
else if (ci >= CRYPT_ACTIVE) { } else if (ci >= CRYPT_ACTIVE) {
log_err(cd, _("Device %s already exists.\n"), name); log_err(cd, _("Device %s already exists.\n"), name);
return -EEXIST; return -EEXIST;
} }