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/PKGBUILD     | 14 +++++++-------
 core/cryptsetup/encrypt_hook |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'core/cryptsetup')

diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 27c7591c2..b1623ed81 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165243 2012-08-14 08:44:57Z thomas $
+# $Id: PKGBUILD 169687 2012-10-26 01:36:12Z dreisner $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
-pkgver=1.5.0
-pkgrel=2
+pkgver=1.5.1
+pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64)
 license=('GPL')
@@ -14,6 +14,10 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
         encrypt_hook
         encrypt_install)
+md5sums=('87cc018c0c65f36043f38ceb8ffd4d81'
+         '5f711687f453f4d5a38596f60df5247a'
+         'c970831d733ca42e20415005967e7843'
+         '21c45f9cab3e0b5165f68358884fbd0f')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
@@ -28,7 +32,3 @@ package() {
   install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
   install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
 }
-md5sums=('0fa7ba8923b0ce8eed2aa65f2cb9950c'
-         'efe1b74dfadf37726397fd27ad0df965'
-         '4dab1b0e23d81907b79b49c2d8d719b5'
-         '21c45f9cab3e0b5165f68358884fbd0f')
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