diff options
Diffstat (limited to 'core/mdadm')
| -rw-r--r-- | core/mdadm/PKGBUILD | 17 | ||||
| -rwxr-xr-x | core/mdadm/mdadm_hook | 2 | ||||
| -rw-r--r-- | core/mdadm/mdadm_install | 3 | ||||
| -rw-r--r-- | core/mdadm/mdadm_udev_install | 23 |
4 files changed, 38 insertions, 7 deletions
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 6bd73e08b..d793695f0 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134363 2011-08-03 06:56:40Z tpowa $ +# $Id: PKGBUILD 138138 2011-09-17 10:36:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -17,6 +17,7 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.conf mdadm_install mdadm_hook + mdadm_udev_install disable-werror.patch linux-3.0.patch) install=mdadm.install @@ -24,8 +25,9 @@ replaces=('raidtools') md5sums=('12ee2fbf3beddb60601fb7a4c4905651' '6df172c8f77b280018cf87eb3d313f29' '00cbed931db4f15b6ce49e3e7d433966' - '4bb000166fb13e82ceaa2422fdfaac7e' - '36f7cc564ed3267888d90208e0eb7adc' + '9b01e96b6c3c218fb61628c9281fe688' + 'c8c0713f5c7da51822ee6f3911473a1c' + 'cd258e1bf430c02a25f40b4329df9f57' '4ad87b74a4bc9a34621280abe0e0c3e4' 'c499b3edbf2c400c8a1984e18c7ce7fa') @@ -33,16 +35,21 @@ build() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch patch -Np1 -i ../linux-3.0.patch - make CXiFLAGS="$CFLAGS" + make CXFLAGS="$CFLAGS" + # build static mdassemble for Arch's initramfs + make MDASSEMBLE_AUTO=1 mdassemble + } package() { cd $srcdir/$pkgname-$pkgver make INSTALL=/bin/install DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/sbin/mdassemble install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm + install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev # symlink for backward compatibility ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid } diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 1d217a5a8..7b2dc1ad1 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -39,4 +39,6 @@ run_hook () esac done fi + # assemble everything + [ -e $mdconfig ] && /sbin/mdassemble } diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index f351cb292..b53258676 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -11,8 +11,7 @@ build() echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdadm" - add_file "/lib/udev/rules.d/64-md-raid.rules" + add_binary "/sbin/mdassemble" } help () diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install new file mode 100644 index 000000000..9fc161624 --- /dev/null +++ b/core/mdadm/mdadm_udev_install @@ -0,0 +1,23 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " + BINARIES="" + FILES="" + SCRIPT="" + # check if a custom mdadm.conf exists + if grep -q ^ARRAY /etc/mdadm.conf; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + add_binary "/sbin/mdadm" + add_file "/lib/udev/rules.d/64-md-raid.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads raid arrays with udev. +HELPEOF +} |