[arch-commits] Commit in mdadm/trunk (5 files)
Tobias Powalowski
tpowa at archlinux.org
Sun Mar 8 18:16:21 UTC 2009
Date: Sunday, March 8, 2009 @ 14:16:21
Author: tpowa
Revision: 29447
upgpkg: mdadm 2.6.8-2
Modified:
mdadm/trunk/PKGBUILD
mdadm/trunk/mdadm.conf
Deleted:
mdadm/trunk/mdadm-2.2-segfault.patch
mdadm/trunk/raid-partitions_hook
mdadm/trunk/raid-partitions_install
--------------------------+
PKGBUILD | 22 +++++++++++-----------
mdadm-2.2-segfault.patch | 12 ------------
mdadm.conf | 5 ++++-
raid-partitions_hook | 21 ---------------------
raid-partitions_install | 32 --------------------------------
5 files changed, 15 insertions(+), 77 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-08 18:03:40 UTC (rev 29446)
+++ PKGBUILD 2009-03-08 18:16:21 UTC (rev 29447)
@@ -2,7 +2,7 @@
# Maintainer: Judd Vinet <jvinet at zeroflux.org>
pkgname=mdadm
pkgver=2.6.8
-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')
@@ -11,13 +11,14 @@
depends=('glibc')
backup=('etc/mdadm.conf')
source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 \
- mdadm mdadm.conf raid-partitions_install raid-partitions_hook)
+ mdadm mdadm.conf mdadm_install mdadm_hook)
+install=mdadm.install
replaces=('raidtools')
md5sums=('2987682214297f43c2870a7584d29859'
'6df172c8f77b280018cf87eb3d313f29'
- '0ce4c0f9770bf582a71228053566359d'
- '9de7e423ec9c6766b5f5d39915929003'
- '09d72c714b40b6fa1e8eab04c1dabd42')
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '5067783b0051dedc95d159af22f0c681'
+ '6e01434e706bfec61cec0df15eec3139')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -25,10 +26,9 @@
make INSTALL=/bin/install DESTDIR=$pkgdir install
install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
- install -D -m644 ../raid-partitions_install $pkgdir/lib/initcpio/install/raid-partitions
- install -D -m644 ../raid-partitions_hook $pkgdir/lib/initcpio/hooks/raid-partitions
- # a static binary is required for Arch's initrd
- rm mdadm
- make LDFLAGS+=-static || return 1
- install -D -m755 mdadm $pkgdir/sbin/mdadm.static
+ install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
+ install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
+ # build static mdassemble for Arch's initramfs
+ make mdassemble.auto
+ install -D -m755 mdassemble.auto $pkgdir/sbin/mdassemble.static
}
Deleted: mdadm-2.2-segfault.patch
===================================================================
--- mdadm-2.2-segfault.patch 2009-03-08 18:03:40 UTC (rev 29446)
+++ mdadm-2.2-segfault.patch 2009-03-08 18:16:21 UTC (rev 29447)
@@ -1,12 +0,0 @@
-diff -Naur mdadm-2.2-orig/Assemble.c mdadm-2.2/Assemble.c
---- mdadm-2.2-orig/Assemble.c 2005-12-04 21:56:20.000000000 -0800
-+++ mdadm-2.2/Assemble.c 2006-02-06 10:56:37.000000000 -0800
-@@ -219,7 +219,7 @@
- }
- if (dfd >= 0) close(dfd);
-
-- if (ident->uuid_set && (!update && strcmp(update, "uuid")!= 0) &&
-+ if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) &&
- (!super || same_uuid(info.uuid, ident->uuid, tst->ss->swapuuid)==0)) {
- if ((inargv && verbose >= 0) || verbose > 0)
- fprintf(stderr, Name ": %s has wrong uuid.\n",
Modified: mdadm.conf
===================================================================
--- mdadm.conf 2009-03-08 18:03:40 UTC (rev 29446)
+++ mdadm.conf 2009-03-08 18:16:21 UTC (rev 29447)
@@ -40,8 +40,11 @@
#
# mdadm -D <md>
#
-# To capture the UUIDs for all your RAID arrays to this file, run this:
+# To capture the UUIDs for all your RAID arrays to this file, run these:
+# to get a list of running arrays:
# # mdadm -D --scan >>/etc/mdadm.conf
+# to get a list from superblocks:
+# # mdadm -E --scan >>/etc/mdadm.conf
#
#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371
#ARRAY /dev/md1 super-minor=1
Deleted: raid-partitions_hook
===================================================================
--- raid-partitions_hook 2009-03-08 18:03:40 UTC (rev 29446)
+++ raid-partitions_hook 2009-03-08 18:16:21 UTC (rev 29447)
@@ -1,21 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
- #TODO scan for these somehow...
- /sbin/modprobe -aq linear multipath raid0 raid1 raid456 raid10>/dev/null 2>&1
- # md= can be specified multiple times. The simplistic commandline
- # parsing does not handle this, so we will let mdassemble parse it
- for i in $(replace $(echo $md) ',' ' '); do
- case $i in d[0-9])
- for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
- /sbin/mdadm --create -a mdp /dev/md_d$i >/dev/null 2>&1
- done
- mdadm --assemble --auto=mdp /dev/md_$(replace $(echo $md) ',' ' ')
- export USE_RAID_ARRAY=1
- ;;
- esac
- done
- if ! [ "$USE_RAID_ARRAY" = "1" ] ; then
- /bin/mdassemble ${CMDLINE}
- fi
-}
Deleted: raid-partitions_install
===================================================================
--- raid-partitions_install 2009-03-08 18:03:40 UTC (rev 29446)
+++ raid-partitions_install 2009-03-08 18:16:21 UTC (rev 29447)
@@ -1,32 +0,0 @@
-# vim: set ft=sh:
-
-install ()
-{
- MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
- BINARIES="mdadm"
- FILES=""
- SCRIPT="raid-partitions"
- add_file "/usr/lib/klibc/bin/mdassemble" "/bin/mdassemble"
-}
-
-help ()
-{
-cat<<HELPEOF
- This hook loads the necessary modules for an raid mdp/partitionable root device,
- and assemble the raid device when run.
-
- Kernel Parameters:
- Specify all your md arrays with md= parameter:
- ::: Example ::: md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
- This will setup 2 md partitionable arrays
-
- Setup:
- - to assemble a partitionable array:
- md=d<md device no.>,dev0,dev1,...,devn
-
- 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
-HELPEOF
-}
More information about the arch-commits
mailing list