Fix return code for status command when device doesn't exists.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@550 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/ChangeLog b/ChangeLog
index ffdd58c..124dbec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-06-08  Milan Broz  <mbroz@redhat.com>
+       * Fix return code for status command when device doesn't exists.
+
 2011-05-24  Milan Broz  <mbroz@redhat.com>
        * Version 1.3.1.
 

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 1faba4b..41c4692 100644 (file)
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -370,6 +370,7 @@ static int action_status(int arg __attribute__((unused)))
                break;
        case CRYPT_INACTIVE:
                log_std("%s/%s is inactive.\n", crypt_get_dir(), action_argv[0]);
+               r = -ENODEV;
                break;
        case CRYPT_ACTIVE:
        case CRYPT_BUSY:

diff --git a/tests/compat-test b/tests/compat-test
index 43bb639..fdd8e49 100755 (executable)
--- a/tests/compat-test
+++ b/tests/compat-test
@@ -255,6 +255,7 @@ $CRYPTSETUP -q status  $DEV_NAME | grep "size:" | grep -q "100 sectors" || fail
 $CRYPTSETUP -q resize  $DEV_NAME || fail
 $CRYPTSETUP -q status  $DEV_NAME | grep "size:" | grep -q "19997 sectors" || fail
 $CRYPTSETUP -q remove  $DEV_NAME || fail
+$CRYPTSETUP -q status  $DEV_NAME >/dev/null && fail
 echo "key0" | $CRYPTSETUP create $DEV_NAME --hash sha1 $LOOPDEV || fail
 $CRYPTSETUP -q remove  $DEV_NAME || fail
 echo "key0" | $CRYPTSETUP -q create $DEV_NAME --hash sha1 $LOOPDEV || fail