From a5721a07196cf00c26ea1bfb651aab756d202ccb Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 26 May 2012 00:02:35 +0000
Subject: Sat May 26 00:02:35 UTC 2012

---
 core/cryptsetup/encrypt_install | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'core/cryptsetup/encrypt_install')

diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install
index 9ed50e863..79d2f3e4b 100644
--- a/core/cryptsetup/encrypt_install
+++ b/core/cryptsetup/encrypt_install
@@ -1,26 +1,39 @@
-# vim: set ft=sh:
+#!/bin/bash
 
-build()
-{
+build() {
     if [ -z "${CRYPTO_MODULES}" ]; then
-        MODULES=" dm-crypt $(all_modules "/crypto/") "
+        MODULES=" dm-crypt $(all_modules "/crypto/")"
     else
-        MODULES=" dm-crypt ${CRYPTO_MODULES} "
+        MODULES=" dm-crypt $CRYPTO_MODULES"
     fi
     FILES=""
     SCRIPT="encrypt"
-    [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
-    [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
-    add_binary "/sbin/dmsetup"
+
+    add_binary "cryptsetup"
+    add_binary "dmsetup"
     add_file "/usr/lib/udev/rules.d/10-dm.rules"
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
 }
 
-help ()
-{
-cat<<HELPEOF
-  This hook allows for an encrypted root device.
+help() {
+  cat <<HELPEOF
+This hook allows for an encrypted root device. Users should specify the device
+to be unlocked using 'cryptdevice=device:dmname' on the kernel command line,
+where 'device' is the path to the raw device, and 'dmname' is the name given to
+the device after unlocking, and will be available as /dev/mapper/dmname.
+
+For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on
+the kernel cmdline, where 'device' represents the raw block device where the key
+exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is
+the absolute path of the keyfile within the device.
+
+Without specifying a keyfile, you will be prompted for the password at runtime.
+This means you must have a keyboard available to input it, and you may need
+the keymap hook as well to ensure that the keyboard is using the layout you
+expect.
 HELPEOF
 }
+
+# vim: set ft=sh ts=4 sw=4 et:
-- 
cgit v1.2.3-54-g00ecf