Date: Saturday, October 20, 2012 @ 12:46:40 Author: dreisner Revision: 169407
upgpkg: cryptsetup 1.5.1-1 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook --------------+ PKGBUILD | 12 ++++++------ encrypt_hook | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-10-20 16:41:52 UTC (rev 169406) +++ PKGBUILD 2012-10-20 16:46:40 UTC (rev 169407) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler <[email protected]> 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 @@ 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 @@ 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') Modified: encrypt_hook =================================================================== --- encrypt_hook 2012-10-20 16:41:52 UTC (rev 169406) +++ encrypt_hook 2012-10-20 16:46:40 UTC (rev 169407) @@ -11,7 +11,9 @@ $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
