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

Fix cryptsetup status output if parameter is device path.

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@682 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2011-11-08 21:29:44 +00:00
parent 01938e3cdd
commit 774d1de56e
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -1,6 +1,7 @@
2011-11-05 Milan Broz <mbroz@redhat.com> 2011-11-05 Milan Broz <mbroz@redhat.com>
* Merge pycryptsetup (Python libcryptsetup bindings). * Merge pycryptsetup (Python libcryptsetup bindings).
* Fix stupid typo in set_iteration_time API call. * Fix stupid typo in set_iteration_time API call.
* Fix cryptsetup status output if parameter is device path.
2011-10-27 Milan Broz <mbroz@redhat.com> 2011-10-27 Milan Broz <mbroz@redhat.com>
* Fix crypt_get_volume_key_size() for plain device. * Fix crypt_get_volume_key_size() for plain device.

15
src/cryptsetup.c
View File

@@ -27,6 +27,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
@@ -378,9 +379,14 @@ static int action_status(int arg __attribute__((unused)))
crypt_status_info ci; crypt_status_info ci;
struct crypt_active_device cad; struct crypt_active_device cad;
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
struct stat st;
char *backing_file; char *backing_file;
const char *device; const char *device;
int r = 0; int path = 0, r = 0;
/* perhaps a path, not a dm device name */
if (strchr(action_argv[0], '/') && !stat(action_argv[0], &st))
path = 1;
ci = crypt_status(NULL, action_argv[0]); ci = crypt_status(NULL, action_argv[0]);
switch (ci) { switch (ci) {
@@ -388,11 +394,18 @@ static int action_status(int arg __attribute__((unused)))
r = -EINVAL; r = -EINVAL;
break; break;
case CRYPT_INACTIVE: case CRYPT_INACTIVE:
if (path)
log_std("%s is inactive.\n", action_argv[0]);
else
log_std("%s/%s is inactive.\n", crypt_get_dir(), action_argv[0]); log_std("%s/%s is inactive.\n", crypt_get_dir(), action_argv[0]);
r = -ENODEV; r = -ENODEV;
break; break;
case CRYPT_ACTIVE: case CRYPT_ACTIVE:
case CRYPT_BUSY: case CRYPT_BUSY:
if (path)
log_std("%s is active%s.\n", action_argv[0],
ci == CRYPT_BUSY ? " and is in use" : "");
else
log_std("%s/%s is active%s.\n", crypt_get_dir(), action_argv[0], log_std("%s/%s is active%s.\n", crypt_get_dir(), action_argv[0],
ci == CRYPT_BUSY ? " and is in use" : ""); ci == CRYPT_BUSY ? " and is in use" : "");
r = crypt_init_by_name(&cd, action_argv[0]); r = crypt_init_by_name(&cd, action_argv[0]);