diff options
author | root <root@rshg054.dnsready.net> | 2012-10-26 02:26:56 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-10-26 02:26:56 -0700 |
commit | ff20b83d60041f745a579e10770706b0b49d5617 (patch) | |
tree | 715ba7ce7d40655e756c284d0875b27da39796e6 /core/cryptsetup/encrypt_hook | |
parent | a3b55a0c47a00ac40bc00a4ce87d93f809273840 (diff) |
Fri Oct 26 02:24:09 PDT 2012
Diffstat (limited to 'core/cryptsetup/encrypt_hook')
-rw-r--r-- | core/cryptsetup/encrypt_hook | 5 |
1 files changed, 3 insertions, 2 deletions
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" ;; *) |