Date: Thursday, June 30, 2011 @ 14:03:08 Author: thomas Revision: 129977
dmraid: Adjust mkinitcpio hook for mkinitcpio 0.7 Modified: dmraid/trunk/PKGBUILD dmraid/trunk/dmraid_hook dmraid/trunk/dmraid_install ----------------+ PKGBUILD | 7 ++++--- dmraid_hook | 3 ++- dmraid_install | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-06-30 17:57:50 UTC (rev 129976) +++ PKGBUILD 2011-06-30 18:03:08 UTC (rev 129977) @@ -4,9 +4,10 @@ pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=1 +pkgrel=2 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/"; +conflicts=('mkinitcpio<0.7') depends=('device-mapper>=2.0.54') arch=('i686' 'x86_64') license=('GPL') @@ -16,8 +17,8 @@ dmraid_hook) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - 'd01908b414e1686c0f3233ff37de78a5' - '0a748b6e78b156f2f9dda45fc629651f') + 'bf6c61a11dbbb40d5152835075c9f438' + '2a1ef82fb32f065ee560dceef736475e') build() { cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname Modified: dmraid_hook =================================================================== --- dmraid_hook 2011-06-30 17:57:50 UTC (rev 129976) +++ dmraid_hook 2011-06-30 18:03:08 UTC (rev 129977) @@ -5,7 +5,8 @@ /sbin/modprobe -q dm-mirror >/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 msg ":: Activating dmraid arrays..." # prevent any event monitoring calls with -I Modified: dmraid_install =================================================================== --- dmraid_install 2011-06-30 17:57:50 UTC (rev 129976) +++ dmraid_install 2011-06-30 18:03:08 UTC (rev 129977) @@ -1,12 +1,11 @@ # vim: set ft=sh: -install () +build() { MODULES=" dm-mod dm-mirror " BINARIES="/sbin/dmraid /sbin/dmsetup" FILES="" SCRIPT="dmraid" - add_dir "/dev/mapper" add_file "/lib/udev/rules.d/10-dm.rules" add_file "/lib/udev/rules.d/13-dm-disk.rules" add_file "/lib/udev/rules.d/95-dm-notify.rules"
