Index: encrypt_hook
===================================================================
--- encrypt_hook	(revision 248758)
+++ encrypt_hook	(working copy)
@@ -54,6 +54,9 @@
             allow-discards)
                 cryptargs="${cryptargs} --allow-discards"
                 ;;
+            header=)
+                cryptheader="${cryptopt#header=}"
+                cryptargs="${cryptargs} --header=${cryptheader}"
             *)
                 echo "Encryption option '${cryptopt}' not known, ignoring." >&2
                 ;;
@@ -61,7 +64,7 @@
     done
 
     if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
-        if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
+        if cryptsetup isLuks ${cryptheader:-${resolved}} >/dev/null 2>&1; then
             [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
             dopassphrase=1
             # If keyfile exists, try to use that
@@ -133,7 +136,7 @@
             err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified."
         fi
     fi
-    rm -f ${ckeyfile}
+    rm -f ${ckeyfile} ${cryptheader}
 }
 
 # vim: set ft=sh ts=4 sw=4 et: