Date: Friday, May 25, 2012 @ 19:52:16 Author: dreisner Revision: 159623
upgpkg: mdadm 3.2.5-2 - update install hook for mkinitcpio .0.9.0 Modified: mdadm/trunk/PKGBUILD mdadm/trunk/mdadm_install mdadm/trunk/mdadm_udev_install --------------------+ PKGBUILD | 6 ++-- mdadm_install | 64 +++++++++++++++++++++++++-------------------------- mdadm_udev_install | 6 +++- 3 files changed, 39 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-05-25 23:50:39 UTC (rev 159622) +++ PKGBUILD 2012-05-25 23:52:16 UTC (rev 159623) @@ -3,7 +3,7 @@ # Contributor: Judd Vinet <jvi...@zeroflux.org> pkgname=mdadm pkgver=3.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -24,9 +24,9 @@ md5sums=('83ba4a6249ae24677e915e44c9cfcc58' '8333d405f550317c2bacd5510bf1cb60' '00cbed931db4f15b6ce49e3e7d433966' - '9b01e96b6c3c218fb61628c9281fe688' + '609d10888727710cb20db7ac3e096116' 'fbb5542d9bdf87441a11dd7e7a0a17f8' - '2318b99701dba9b01a6891c62be7bc1c' + 'd1d8e9eb81ce9347de74f3c84a9db09e' 'aafb5f9ac8437a284cbf948b9b13b179' '4ad87b74a4bc9a34621280abe0e0c3e4') Modified: mdadm_install =================================================================== --- mdadm_install 2012-05-25 23:50:39 UTC (rev 159622) +++ mdadm_install 2012-05-25 23:52:16 UTC (rev 159623) @@ -1,45 +1,45 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " - BINARIES="" - FILES="" - SCRIPT="mdadm" +build() { + add_checked_modules -f 'dm-' 'drivers/md/*' + # 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/mdassemble" + + add_runscript } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for any raid root device, - and assembles the raid device when run. +help() { + cat <<HELPEOF +This hook loads the necessary modules for any raid root device, +and assembles the raid device when run. - If arrays are defined in /etc/mdadm.conf, the file will be used instead - of command line assembling. - - Command Line Setup: - - for raid arrays with persistent superblocks: - md=<md device no.>,dev0,dev1,...,devn - md=<md device no.>,uuid - - for partitionable raid arrays with persistent superblocks: - md=d<md device no.>,dev0,dev1,...,devn - md=d<md device no.>,uuid +If arrays are defined in /etc/mdadm.conf, the file will be used instead +of command line assembling. - Parameters: - - <md device no.> = the number of the md device: - 0 means md0, 1 means md1, ... - - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 - or 0900878d:f95f6057:c39a36e9:55efa60a - Examples: - - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 - This will setup 2 md partitionable arrays. - - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 - This will setup 2 md arrays with persistent superblocks. +Command Line Setup: +- for raid arrays with persistent superblocks: + md=<md device no.>,dev0,dev1,...,devn + md=<md device no.>,uuid +- for partitionable raid arrays with persistent superblocks: + md=d<md device no.>,dev0,dev1,...,devn + md=d<md device no.>,uuid + +Parameters: +- <md device no.> = the number of the md device: + 0 means md0, 1 means md1, ... +- <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 + or 0900878d:f95f6057:c39a36e9:55efa60a +Examples: +- md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 + This will setup 2 md partitionable arrays. +- md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 + This will setup 2 md arrays with persistent superblocks. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: Modified: mdadm_udev_install =================================================================== --- mdadm_udev_install 2012-05-25 23:50:39 UTC (rev 159622) +++ mdadm_udev_install 2012-05-25 23:52:16 UTC (rev 159623) @@ -1,7 +1,7 @@ #!/bin/bash build() { - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")" + add_checked_modules -f 'dm-' 'drivers/md/*' # check if a custom mdadm.conf exists if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then @@ -15,7 +15,9 @@ help() { cat <<HELPEOF - This hook loads raid arrays with udev. +This hook loads the necessary modules for a RAID array and uses incremental +assembly via udev at runtime to create the devices. This hook with NOT work +without the udev hook included on the image. HELPEOF }