Date: Thursday, June 30, 2011 @ 13:57:50 Author: thomas Revision: 129976
cryptsetup: Adjust mkinitcpio hook for mkinitcpio 0.7 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook cryptsetup/trunk/encrypt_install -----------------+ PKGBUILD | 8 ++++---- encrypt_hook | 3 ++- encrypt_install | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-06-30 17:54:05 UTC (rev 129975) +++ PKGBUILD 2011-06-30 17:57:50 UTC (rev 129976) @@ -2,21 +2,21 @@ # Maintainer: Thomas Bächler <[email protected]> pkgname=cryptsetup pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/"; groups=('base') depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' - '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' - '07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') + 'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e' + 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') build() { cd $srcdir/$pkgname-${pkgver} Modified: encrypt_hook =================================================================== --- encrypt_hook 2011-06-30 17:54:05 UTC (rev 129975) +++ encrypt_hook 2011-06-30 17:57:50 UTC (rev 129976) @@ -6,7 +6,8 @@ /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" Modified: encrypt_install =================================================================== --- encrypt_install 2011-06-30 17:54:05 UTC (rev 129975) +++ encrypt_install 2011-06-30 17:57:50 UTC (rev 129976) @@ -1,6 +1,6 @@ # vim: set ft=sh: -install () +build() { if [ -z "${CRYPTO_MODULES}" ]; then MODULES=" dm-crypt $(all_modules "/crypto/") " @@ -9,7 +9,6 @@ fi FILES="" SCRIPT="encrypt" - add_dir "/dev/mapper" [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" add_binary "/sbin/dmsetup"
