diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
| commit | 66873986693bc3c8812d12f3919f1977b9a30674 (patch) | |
| tree | 14a385b80dfa23890d9d864dd89fafb61dd38ff2 /core/dmraid | |
| parent | fa448c3d0b12a414235560d2cbd14eb74aace7bd (diff) | |
| parent | e03f4b9bc9da3327de94bc58aa92ecb836c1580d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/puzzles/PKGBUILD
core/lvm2/PKGBUILD
core/mdadm/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core/dmraid')
| -rw-r--r-- | core/dmraid/PKGBUILD | 9 | ||||
| -rw-r--r-- | core/dmraid/dmraid_hook | 3 | ||||
| -rw-r--r-- | core/dmraid/dmraid_install | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index 0f229dd11..b15879ebf 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' 'mips64el') 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" |