[arch-commits] Commit in mdadm/trunk (4 files)

[Tobias Powalowski]

    Date: Wednesday, September 14, 2011 @ 05:42:07
  Author: tpowa
Revision: 138012

upgpkg: mdadm 3.2.2-4

move mdadm udev initialisation to separate hook, restore old mdadm hook to fix issues udev cannot fix

Added:
  mdadm/trunk/mdadm_udev_install
Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_hook
  mdadm/trunk/mdadm_install

--------------------+
 PKGBUILD           |   13 ++++++++++---
 mdadm_hook         |    2 ++
 mdadm_install      |    3 +--
 mdadm_udev_install |   23 +++++++++++++++++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-14 09:40:49 UTC (rev 138011)
+++ PKGBUILD	2011-09-14 09:42:07 UTC (rev 138012)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet <jvinet at 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)
 license=('GPL')
@@ -17,6 +17,7 @@
         mdadm.conf 
         mdadm_install
         mdadm_hook
+        mdadm_udev_install
         disable-werror.patch
         linux-3.0.patch)
 install=mdadm.install
@@ -24,8 +25,9 @@
 md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
          '6df172c8f77b280018cf87eb3d313f29'
          '00cbed931db4f15b6ce49e3e7d433966'
-         '4bb000166fb13e82ceaa2422fdfaac7e'
-         '36f7cc564ed3267888d90208e0eb7adc'
+         '9b01e96b6c3c218fb61628c9281fe688'
+         'c8c0713f5c7da51822ee6f3911473a1c'
+         'cd258e1bf430c02a25f40b4329df9f57'
          '4ad87b74a4bc9a34621280abe0e0c3e4'
          'c499b3edbf2c400c8a1984e18c7ce7fa')
 
@@ -34,15 +36,20 @@
   patch -Np0 -i ../disable-werror.patch
   patch -Np1 -i ../linux-3.0.patch
   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
 }

Modified: mdadm_hook
===================================================================
--- mdadm_hook	2011-09-14 09:40:49 UTC (rev 138011)
+++ mdadm_hook	2011-09-14 09:42:07 UTC (rev 138012)
@@ -39,4 +39,6 @@
             esac 
         done
     fi
+    # assemble everything
+    [ -e $mdconfig ] && /sbin/mdassemble
 }

Modified: mdadm_install
===================================================================
--- mdadm_install	2011-09-14 09:40:49 UTC (rev 138011)
+++ mdadm_install	2011-09-14 09:42:07 UTC (rev 138012)
@@ -11,8 +11,7 @@
         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 ()

Added: mdadm_udev_install
===================================================================
--- mdadm_udev_install	                        (rev 0)
+++ mdadm_udev_install	2011-09-14 09:42:07 UTC (rev 138012)
@@ -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
+}