[arch-commits] Commit in mdadm/repos (19 files)
Tobias Powalowski
tpowa at archlinux.org
Mon Apr 30 07:17:52 UTC 2012
Date: Monday, April 30, 2012 @ 03:17:52
Author: tpowa
Revision: 157940
db-move: moved mdadm from [testing] to [core] (i686)
Added:
mdadm/repos/core-i686/PKGBUILD
(from rev 157938, mdadm/repos/testing-i686/PKGBUILD)
mdadm/repos/core-i686/disable-werror.patch
(from rev 157938, mdadm/repos/testing-i686/disable-werror.patch)
mdadm/repos/core-i686/linux-3.0.patch
(from rev 157938, mdadm/repos/testing-i686/linux-3.0.patch)
mdadm/repos/core-i686/mdadm
(from rev 157938, mdadm/repos/testing-i686/mdadm)
mdadm/repos/core-i686/mdadm.conf
(from rev 157938, mdadm/repos/testing-i686/mdadm.conf)
mdadm/repos/core-i686/mdadm.install
(from rev 157938, mdadm/repos/testing-i686/mdadm.install)
mdadm/repos/core-i686/mdadm_hook
(from rev 157938, mdadm/repos/testing-i686/mdadm_hook)
mdadm/repos/core-i686/mdadm_install
(from rev 157938, mdadm/repos/testing-i686/mdadm_install)
mdadm/repos/core-i686/mdadm_udev_install
(from rev 157938, mdadm/repos/testing-i686/mdadm_udev_install)
Deleted:
mdadm/repos/core-i686/PKGBUILD
mdadm/repos/core-i686/disable-werror.patch
mdadm/repos/core-i686/linux-3.0.patch
mdadm/repos/core-i686/mdadm
mdadm/repos/core-i686/mdadm.conf
mdadm/repos/core-i686/mdadm.install
mdadm/repos/core-i686/mdadm_hook
mdadm/repos/core-i686/mdadm_install
mdadm/repos/core-i686/mdadm_udev_install
mdadm/repos/testing-i686/
----------------------+
PKGBUILD | 106 +++++++++++++++++++-------------------
disable-werror.patch | 22 ++++----
linux-3.0.patch | 90 ++++++++++++++++----------------
mdadm | 74 +++++++++++++--------------
mdadm.conf | 134 ++++++++++++++++++++++++-------------------------
mdadm.install | 20 +++----
mdadm_hook | 88 ++++++++++++++++----------------
mdadm_install | 90 ++++++++++++++++----------------
mdadm_udev_install | 46 ++++++++--------
9 files changed, 335 insertions(+), 335 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/PKGBUILD 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
-pkgname=mdadm
-pkgver=3.2.3
-pkgrel=1
-pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://neil.brown.name/blog/mdadm"
-groups=('base')
-conflicts=('mkinitcpio<0.7')
-depends=('glibc')
-backup=('etc/mdadm.conf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
- mdadm
- mdadm.conf
- mdadm_install
- mdadm_hook
- mdadm_udev_install
- disable-werror.patch)
-
-install=mdadm.install
-replaces=('raidtools')
-md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
- '6df172c8f77b280018cf87eb3d313f29'
- '00cbed931db4f15b6ce49e3e7d433966'
- '9b01e96b6c3c218fb61628c9281fe688'
- 'c8c0713f5c7da51822ee6f3911473a1c'
- 'cd258e1bf430c02a25f40b4329df9f57'
- '4ad87b74a4bc9a34621280abe0e0c3e4')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- patch -Np0 -i ../disable-werror.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
-}
Copied: mdadm/repos/core-i686/PKGBUILD (from rev 157938, mdadm/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-04-30 07:17:52 UTC (rev 157940)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+pkgname=mdadm
+pkgver=3.2.3
+pkgrel=2
+pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://neil.brown.name/blog/mdadm"
+groups=('base')
+conflicts=('mkinitcpio<0.7')
+depends=('glibc')
+backup=('etc/mdadm.conf')
+source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
+ mdadm
+ mdadm.conf
+ mdadm_install
+ mdadm_hook
+ mdadm_udev_install
+ disable-werror.patch)
+
+install=mdadm.install
+replaces=('raidtools')
+md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
+ '6df172c8f77b280018cf87eb3d313f29'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '9b01e96b6c3c218fb61628c9281fe688'
+ 'c8c0713f5c7da51822ee6f3911473a1c'
+ 'cd258e1bf430c02a25f40b4329df9f57'
+ '4ad87b74a4bc9a34621280abe0e0c3e4')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np0 -i ../disable-werror.patch
+ make CXFLAGS="$CFLAGS"
+ # build static mdassemble for Arch's initramfs
+ make MDASSEMBLE_AUTO=1 mdassemble
+
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make INSTALL=/usr/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/usr/lib/initcpio/install/mdadm
+ install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
+ install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
+ # symlink for backward compatibility
+ ln -sf /usr/lib/initcpio/hooks/mdadm $pkgdir/usr/lib/initcpio/hooks/raid
+}
Deleted: core-i686/disable-werror.patch
===================================================================
--- core-i686/disable-werror.patch 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/disable-werror.patch 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,11 +0,0 @@
---- Makefile.old 2011-06-17 09:38:03.269238332 +0200
-+++ Makefile 2011-06-17 09:38:14.122398837 +0200
-@@ -42,7 +42,7 @@
-
- CC = $(CROSS_COMPILE)gcc
- CXFLAGS = -ggdb
--CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
-+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
- ifdef WARN_UNUSED
- CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
- endif
Copied: mdadm/repos/core-i686/disable-werror.patch (from rev 157938, mdadm/repos/testing-i686/disable-werror.patch)
===================================================================
--- core-i686/disable-werror.patch (rev 0)
+++ core-i686/disable-werror.patch 2012-04-30 07:17:52 UTC (rev 157940)
@@ -0,0 +1,11 @@
+--- Makefile.old 2011-06-17 09:38:03.269238332 +0200
++++ Makefile 2011-06-17 09:38:14.122398837 +0200
+@@ -42,7 +42,7 @@
+
+ CC = $(CROSS_COMPILE)gcc
+ CXFLAGS = -ggdb
+-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
+ ifdef WARN_UNUSED
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ endif
Deleted: core-i686/linux-3.0.patch
===================================================================
--- core-i686/linux-3.0.patch 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/linux-3.0.patch 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,45 +0,0 @@
-From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb at suse.de>
-Date: Fri, 17 Jun 2011 22:49:24 +1000
-Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers.
-
-The next version of Linux might be 3.0. If it is, get_linux_version
-will fail.
-So make it more robust.
-
-Reported-by: Namhyung Kim <namhyung at gmail.com>
-Reported-by: Milan Broz <mbroz at redhat.com>
-Signed-off-by: NeilBrown <neilb at suse.de>
----
- util.c | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/util.c b/util.c
-index 10bbe56..55d171a 100644
---- a/util.c
-+++ b/util.c
-@@ -146,16 +146,16 @@ int get_linux_version()
- {
- struct utsname name;
- char *cp;
-- int a,b,c;
-+ int a = 0, b = 0,c = 0;
- if (uname(&name) <0)
- return -1;
-
- cp = name.release;
- a = strtoul(cp, &cp, 10);
-- if (*cp != '.') return -1;
-- b = strtoul(cp+1, &cp, 10);
-- if (*cp != '.') return -1;
-- c = strtoul(cp+1, NULL, 10);
-+ if (*cp == '.')
-+ b = strtoul(cp+1, &cp, 10);
-+ if (*cp == '.')
-+ c = strtoul(cp+1, &cp, 10);
-
- return (a*1000000)+(b*1000)+c;
- }
---
-1.7.2.3
-
Copied: mdadm/repos/core-i686/linux-3.0.patch (from rev 157938, mdadm/repos/testing-i686/linux-3.0.patch)
===================================================================
--- core-i686/linux-3.0.patch (rev 0)
+++ core-i686/linux-3.0.patch 2012-04-30 07:17:52 UTC (rev 157940)
@@ -0,0 +1,45 @@
+From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb at suse.de>
+Date: Fri, 17 Jun 2011 22:49:24 +1000
+Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers.
+
+The next version of Linux might be 3.0. If it is, get_linux_version
+will fail.
+So make it more robust.
+
+Reported-by: Namhyung Kim <namhyung at gmail.com>
+Reported-by: Milan Broz <mbroz at redhat.com>
+Signed-off-by: NeilBrown <neilb at suse.de>
+---
+ util.c | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 10bbe56..55d171a 100644
+--- a/util.c
++++ b/util.c
+@@ -146,16 +146,16 @@ int get_linux_version()
+ {
+ struct utsname name;
+ char *cp;
+- int a,b,c;
++ int a = 0, b = 0,c = 0;
+ if (uname(&name) <0)
+ return -1;
+
+ cp = name.release;
+ a = strtoul(cp, &cp, 10);
+- if (*cp != '.') return -1;
+- b = strtoul(cp+1, &cp, 10);
+- if (*cp != '.') return -1;
+- c = strtoul(cp+1, NULL, 10);
++ if (*cp == '.')
++ b = strtoul(cp+1, &cp, 10);
++ if (*cp == '.')
++ c = strtoul(cp+1, &cp, 10);
+
+ return (a*1000000)+(b*1000)+c;
+ }
+--
+1.7.2.3
+
Deleted: core-i686/mdadm
===================================================================
--- core-i686/mdadm 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/mdadm 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/mdadm`
-case "$1" in
- start)
- stat_busy "Starting mdadm RAID Monitor"
- if [ -z "$PID" ]; then
- /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon mdadm
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping mdadm RAID Monitor"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mdadm
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
Copied: mdadm/repos/core-i686/mdadm (from rev 157938, mdadm/repos/testing-i686/mdadm)
===================================================================
--- core-i686/mdadm (rev 0)
+++ core-i686/mdadm 2012-04-30 07:17:52 UTC (rev 157940)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /sbin/mdadm`
+case "$1" in
+ start)
+ stat_busy "Starting mdadm RAID Monitor"
+ if [ -z "$PID" ]; then
+ /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f
+ fi
+ if [ ! -z "$PID" -o $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon mdadm
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping mdadm RAID Monitor"
+ [ ! -z "$PID" ] && kill $PID &>/dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon mdadm
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
Deleted: core-i686/mdadm.conf
===================================================================
--- core-i686/mdadm.conf 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/mdadm.conf 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,67 +0,0 @@
-# mdadm configuration file
-#
-# mdadm will function properly without the use of a configuration file,
-# but this file is useful for keeping track of arrays and member disks.
-# In general, a mdadm.conf file is created, and updated, after arrays
-# are created. This is the opposite behavior of /etc/raidtab which is
-# created prior to array construction.
-#
-#
-# the config file takes two types of lines:
-#
-# DEVICE lines specify a list of devices of where to look for
-# potential member disks
-#
-# ARRAY lines specify information about how to identify arrays so
-# so that they can be activated
-#
-
-
-# You can have more than one device line and use wild cards. The first
-# example includes SCSI the first partition of SCSI disks /dev/sdb,
-# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second
-# line looks for array slices on IDE disks.
-#
-#DEVICE /dev/sd[bcdjkl]1
-#DEVICE /dev/hda1 /dev/hdb1
-#
-# The designation "partitions" will scan all partitions found in
-# /proc/partitions
-DEVICE partitions
-
-
-# ARRAY lines specify an array to assemble and a method of identification.
-# Arrays can currently be identified by using a UUID, superblock minor number,
-# or a listing of devices.
-#
-# super-minor is usually the minor number of the metadevice
-# UUID is the Universally Unique Identifier for the array
-# Each can be obtained using
-#
-# mdadm -D <md>
-#
-# 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
-#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1
-#
-# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor
-# will then move a spare between arrays in a spare-group if one array has a
-# failed drive but no spare
-#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1
-#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1
-#
-
-
-# When used in --follow (aka --monitor) mode, mdadm needs a
-# mail address and/or a program. To start mdadm's monitor mode, add
-# "mdadm" to your DAEMONS array in /etc/rc.conf
-#
-# If the lines are not found, mdadm will exit quietly
-#MAILADDR root at mydomain.tld
-#PROGRAM /usr/sbin/handle-mdadm-events
Copied: mdadm/repos/core-i686/mdadm.conf (from rev 157938, mdadm/repos/testing-i686/mdadm.conf)
===================================================================
--- core-i686/mdadm.conf (rev 0)
+++ core-i686/mdadm.conf 2012-04-30 07:17:52 UTC (rev 157940)
@@ -0,0 +1,67 @@
+# mdadm configuration file
+#
+# mdadm will function properly without the use of a configuration file,
+# but this file is useful for keeping track of arrays and member disks.
+# In general, a mdadm.conf file is created, and updated, after arrays
+# are created. This is the opposite behavior of /etc/raidtab which is
+# created prior to array construction.
+#
+#
+# the config file takes two types of lines:
+#
+# DEVICE lines specify a list of devices of where to look for
+# potential member disks
+#
+# ARRAY lines specify information about how to identify arrays so
+# so that they can be activated
+#
+
+
+# You can have more than one device line and use wild cards. The first
+# example includes SCSI the first partition of SCSI disks /dev/sdb,
+# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second
+# line looks for array slices on IDE disks.
+#
+#DEVICE /dev/sd[bcdjkl]1
+#DEVICE /dev/hda1 /dev/hdb1
+#
+# The designation "partitions" will scan all partitions found in
+# /proc/partitions
+DEVICE partitions
+
+
+# ARRAY lines specify an array to assemble and a method of identification.
+# Arrays can currently be identified by using a UUID, superblock minor number,
+# or a listing of devices.
+#
+# super-minor is usually the minor number of the metadevice
+# UUID is the Universally Unique Identifier for the array
+# Each can be obtained using
+#
+# mdadm -D <md>
+#
+# 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
+#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1
+#
+# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor
+# will then move a spare between arrays in a spare-group if one array has a
+# failed drive but no spare
+#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1
+#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1
+#
+
+
+# When used in --follow (aka --monitor) mode, mdadm needs a
+# mail address and/or a program. To start mdadm's monitor mode, add
+# "mdadm" to your DAEMONS array in /etc/rc.conf
+#
+# If the lines are not found, mdadm will exit quietly
+#MAILADDR root at mydomain.tld
+#PROGRAM /usr/sbin/handle-mdadm-events
Deleted: core-i686/mdadm.install
===================================================================
--- core-i686/mdadm.install 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/mdadm.install 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,10 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_upgrade() {
- if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then
- echo "Attention mdadm update:"
- echo "raid_partitions hook has been replaced by the more powerfull mdadm hook."
- echo "Please update your /etc/mkinitcpio.conf accordingly."
- fi
-}
Copied: mdadm/repos/core-i686/mdadm.install (from rev 157938, mdadm/repos/testing-i686/mdadm.install)
===================================================================
--- core-i686/mdadm.install (rev 0)
+++ core-i686/mdadm.install 2012-04-30 07:17:52 UTC (rev 157940)
@@ -0,0 +1,10 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+post_upgrade() {
+ if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then
+ echo "Attention mdadm update:"
+ echo "raid_partitions hook has been replaced by the more powerfull mdadm hook."
+ echo "Please update your /etc/mkinitcpio.conf accordingly."
+ fi
+}
Deleted: core-i686/mdadm_hook
===================================================================
--- core-i686/mdadm_hook 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/mdadm_hook 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,44 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
- input="$(cat /proc/cmdline)"
- mdconfig="/etc/mdadm.conf"
- # for partitionable raid, we need to load md_mod first!
- modprobe md_mod 2>/dev/null
- # If md is specified on commandline, create config file from those parameters.
- if [ "$(echo $input | grep "md=")" ]; then
- #Create initial mdadm.conf
- # scan all devices in /proc/partitions
- echo DEVICE partitions > $mdconfig
- for i in $input; do
- case $i in
- # raid
- md=[0-9]*,/*)
- device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
- array="$(echo $i | cut -d, -f2-)"
- echo "ARRAY /dev/$device devices=$array" >> $mdconfig
- ;;
- # partitionable raid
- md=d[0-9]*,/*)
- device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
- array="$(echo $i | cut -d, -f2-)"
- echo "ARRAY /dev/$device devices=$array" >> $mdconfig
- ;;
- # raid UUID
- md=[0-9]*,[0-9,a-z]*)
- device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
- array="$(echo $i | cut -d, -f2-)"
- echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
- ;;
- # partitionable raid UUID
- md=d[0-9]*,[0-9,a-z]*)
- device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
- array="$(echo $i | cut -d, -f2-)"
- echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
- ;;
- esac
- done
- fi
- # assemble everything
- [ -e $mdconfig ] && /sbin/mdassemble
-}
Copied: mdadm/repos/core-i686/mdadm_hook (from rev 157938, mdadm/repos/testing-i686/mdadm_hook)
===================================================================
--- core-i686/mdadm_hook (rev 0)
+++ core-i686/mdadm_hook 2012-04-30 07:17:52 UTC (rev 157940)
@@ -0,0 +1,44 @@
+# vim: set ft=sh:
+run_hook ()
+{
+ input="$(cat /proc/cmdline)"
+ mdconfig="/etc/mdadm.conf"
+ # for partitionable raid, we need to load md_mod first!
+ modprobe md_mod 2>/dev/null
+ # If md is specified on commandline, create config file from those parameters.
+ if [ "$(echo $input | grep "md=")" ]; then
+ #Create initial mdadm.conf
+ # scan all devices in /proc/partitions
+ echo DEVICE partitions > $mdconfig
+ for i in $input; do
+ case $i in
+ # raid
+ md=[0-9]*,/*)
+ device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
+ array="$(echo $i | cut -d, -f2-)"
+ echo "ARRAY /dev/$device devices=$array" >> $mdconfig
+ ;;
+ # partitionable raid
+ md=d[0-9]*,/*)
+ device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
+ array="$(echo $i | cut -d, -f2-)"
+ echo "ARRAY /dev/$device devices=$array" >> $mdconfig
+ ;;
+ # raid UUID
+ md=[0-9]*,[0-9,a-z]*)
+ device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
+ array="$(echo $i | cut -d, -f2-)"
+ echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
+ ;;
+ # partitionable raid UUID
+ md=d[0-9]*,[0-9,a-z]*)
+ device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
+ array="$(echo $i | cut -d, -f2-)"
+ echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
+ ;;
+ esac
+ done
+ fi
+ # assemble everything
+ [ -e $mdconfig ] && /sbin/mdassemble
+}
Deleted: core-i686/mdadm_install
===================================================================
--- core-i686/mdadm_install 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/mdadm_install 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,45 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
- MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
- BINARIES=""
- FILES=""
- SCRIPT="mdadm"
- # 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"
-}
-
-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
-
- 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
-}
Copied: mdadm/repos/core-i686/mdadm_install (from rev 157938, mdadm/repos/testing-i686/mdadm_install)
===================================================================
--- core-i686/mdadm_install (rev 0)
+++ core-i686/mdadm_install 2012-04-30 07:17:52 UTC (rev 157940)
@@ -0,0 +1,45 @@
+# vim: set ft=sh:
+
+build()
+{
+ MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
+ BINARIES=""
+ FILES=""
+ SCRIPT="mdadm"
+ # 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"
+}
+
+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
+
+ 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
+}
Deleted: core-i686/mdadm_udev_install
===================================================================
--- core-i686/mdadm_udev_install 2012-04-30 07:17:50 UTC (rev 157939)
+++ core-i686/mdadm_udev_install 2012-04-30 07:17:52 UTC (rev 157940)
@@ -1,23 +0,0 @@
-# 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
-}
Copied: mdadm/repos/core-i686/mdadm_udev_install (from rev 157938, mdadm/repos/testing-i686/mdadm_udev_install)
===================================================================
--- core-i686/mdadm_udev_install (rev 0)
+++ core-i686/mdadm_udev_install 2012-04-30 07:17:52 UTC (rev 157940)
@@ -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
+}
More information about the arch-commits
mailing list