Always print warning when device is not LUKS in crypt_load().

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

diff --git a/lib/setup.c b/lib/setup.c
index 101caba..bd9bf25 100644 (file)
--- a/lib/setup.c
+++ b/lib/setup.c
@@ -1182,7 +1182,7 @@ int crypt_load(struct crypt_device *cd,
                return -ENOSYS;
        }
 
-       r = LUKS_read_phdr(cd->device, &hdr, 0, cd);
+       r = LUKS_read_phdr(cd->device, &hdr, 1, cd);
 
        if (!r) {
                memcpy(&cd->hdr, &hdr, sizeof(hdr));

diff --git a/luks/keymanage.c b/luks/keymanage.c
index 54d322a..63700da 100644 (file)
--- a/luks/keymanage.c
+++ b/luks/keymanage.c
@@ -251,9 +251,9 @@ static int _check_and_convert_hdr(const char *device,
        if(memcmp(hdr->magic, luksMagic, LUKS_MAGIC_L)) { /* Check magic */
                log_dbg("LUKS header not detected.");
                if (require_luks_device)
-                       log_err(ctx, _("%s is not a LUKS device.\n"), device);
+                       log_err(ctx, _("%s is not LUKS device.\n"), device);
                else
-                       set_error(_("%s is not a LUKS device."), device);
+                       set_error(_("%s is not LUKS device."), device);
                r = -EINVAL;
        } else if((hdr->version = ntohs(hdr->version)) != 1) {  /* Convert every uint16/32_t item from network byte order */
                log_err(ctx, _("Unsupported LUKS version %d.\n"), hdr->version);