From e03f4b9bc9da3327de94bc58aa92ecb836c1580d Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Mon, 11 Jul 2011 23:12:58 +0000
Subject: Mon Jul 11 23:12:58 UTC 2011

---
 core/dmraid/PKGBUILD       | 9 +++++----
 core/dmraid/dmraid_hook    | 3 ++-
 core/dmraid/dmraid_install | 3 +--
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'core/dmraid')

diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD
index 118b43474..5af91a2ec 100644
--- a/core/dmraid/PKGBUILD
+++ b/core/dmraid/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 116764 2011-03-25 20:30:44Z tpowa $
+# $Id: PKGBUILD 129977 2011-06-30 18:03:08Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 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 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
         dmraid_hook)
 install=dmraid.install
 md5sums=('819338fcef98e8e25819f0516722beeb'
-         'd01908b414e1686c0f3233ff37de78a5'
-         '0a748b6e78b156f2f9dda45fc629651f')
+         'bf6c61a11dbbb40d5152835075c9f438'
+         '2a1ef82fb32f065ee560dceef736475e')
 
 build() {
   cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
diff --git a/core/dmraid/dmraid_hook b/core/dmraid/dmraid_hook
index d4e758c34..6219a718a 100644
--- a/core/dmraid/dmraid_hook
+++ b/core/dmraid/dmraid_hook
@@ -5,7 +5,8 @@ run_hook ()
     /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
diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install
index a20960aed..eeb9e0893 100644
--- a/core/dmraid/dmraid_install
+++ b/core/dmraid/dmraid_install
@@ -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"
-- 
cgit v1.2.3-54-g00ecf