From ff20b83d60041f745a579e10770706b0b49d5617 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 26 Oct 2012 02:26:56 -0700
Subject: Fri Oct 26 02:24:09 PDT 2012

---
 core/cryptsetup/encrypt_hook | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/cryptsetup/encrypt_hook')

diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook
index 372b7ba57..11db3443a 100644
--- a/core/cryptsetup/encrypt_hook
+++ b/core/cryptsetup/encrypt_hook
@@ -11,7 +11,9 @@ run_hook() {
 $cryptkey
 EOF
 
-        if resolved=$(resolve_device "${ckdev}" ${rootdelay}); then
+        if [ "$ckdev" = "rootfs" ]; then
+            ckeyfile=$ckarg1
+        elif resolved=$(resolve_device "${ckdev}" ${rootdelay}); then
             case ${ckarg1} in
                 *[!0-9]*)
                     # Use a file on the device
@@ -50,7 +52,6 @@ EOF
     for cryptopt in ${cryptoptions//,/ }; do
         case ${cryptopt} in
             allow-discards)
-                echo "Enabling TRIM/discard support."
                 cryptargs="${cryptargs} --allow-discards"
                 ;;
             *)
-- 
cgit v1.2.3-54-g00ecf