Fallback detection if device is crypted.

svn-id: @12438

diff --git a/mod-luks.sh b/mod-luks.sh
index d1f1a0e9816845acd947cd1c1683ff2e1b76f810..45cd7ae55a01097dda7e5f33db08e530f9d2e4ec 100644 (file)
--- a/mod-luks.sh
+++ b/mod-luks.sh
@@ -37,7 +37,7 @@ is_luks() {
                return 1
        fi
 
-       local dev dm_name=${node#/dev/mapper/}
+       local dev dm_status dm_name=${node#/dev/mapper/}
        if [ "$node" = "$dm_name" ]; then
                debug "is_luks: $node is not device mapper name"
                return 1
@@ -48,7 +48,15 @@ is_luks() {
                /sbin/cryptsetup isLuks $dev
                rc=$?
        else
-               rc=1
+               # If luks partition was activated using old cryptsetup (at initrd level)
+               # then "device:" report could be missing from cryptsetup status above.
+               # Fallback to dmsetup report in such case.
+               dm_status=$(/sbin/dmsetup status --target crypt $dm_name 2>/dev/null)
+               if [ -n "$dm_status" ]; then
+                       rc=0
+               else
+                       rc=1
+               fi
        fi
 
        if [ $rc = 0 ]; then