diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-06-03 02:03:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-06-03 02:03:40 +0000 |
| commit | aae41e1e1a3baab534d2a4e9a63dd07972ad37be (patch) | |
| tree | b7c4a2e70a58729835d07911580fb0948deee95f /sys-fs | |
| parent | old (diff) | |
| download | gentoo-2-aae41e1e1a3baab534d2a4e9a63dd07972ad37be.tar.gz gentoo-2-aae41e1e1a3baab534d2a4e9a63dd07972ad37be.tar.bz2 gentoo-2-aae41e1e1a3baab534d2a4e9a63dd07972ad37be.zip | |
Drop mdadm.conf parsing now that auto assembling is requied with newer superblock formats and the auto option actually works #321909 by Diego E. Pettenò.
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/mdadm/ChangeLog | 7 | ||||
| -rwxr-xr-x | sys-fs/mdadm/files/raid-start.sh-3.0 | 39 |
2 files changed, 24 insertions, 22 deletions
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog index ea2386f78266..b07914bd9e6c 100644 --- a/sys-fs/mdadm/ChangeLog +++ b/sys-fs/mdadm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/mdadm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.128 2010/01/24 22:20:56 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.129 2010/06/03 02:03:40 vapier Exp $ + + 03 Jun 2010; Mike Frysinger <vapier@gentoo.org> files/raid-start.sh-3.0: + Drop mdadm.conf parsing now that auto assembling is requied with newer + superblock formats and the auto option actually works #321909 by Diego E. + Pettenò. *mdadm-3.1.1-r1 (24 Jan 2010) diff --git a/sys-fs/mdadm/files/raid-start.sh-3.0 b/sys-fs/mdadm/files/raid-start.sh-3.0 index 7a12fee370c9..4236622fef19 100755 --- a/sys-fs/mdadm/files/raid-start.sh-3.0 +++ b/sys-fs/mdadm/files/raid-start.sh-3.0 @@ -1,31 +1,28 @@ # /lib/rcscripts/addons/raid-start.sh: Setup raid volumes at boot -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-start.sh-3.0,v 1.1 2009/08/23 11:19:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-start.sh-3.0,v 1.2 2010/06/03 02:03:40 vapier Exp $ [ -f /proc/mdstat ] || exit 0 -# Start software raid with mdadm (new school) -mdadm_conf="/etc/mdadm/mdadm.conf" -[ -e /etc/mdadm.conf ] && mdadm_conf="/etc/mdadm.conf" -if [ -x /sbin/mdadm -a -f "${mdadm_conf}" ] ; then - devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' "${mdadm_conf}") - if [ -n "${devs}" ]; then - ebegin "Starting up RAID devices" - output=$(mdadm -As 2>&1) - ret=$? - [ ${ret} -ne 0 ] && echo "${output}" - eend ${ret} - fi +# Start software raid with mdadm +if [ -x /sbin/mdadm ] ; then + ebegin "Starting up RAID devices" + output=$(mdadm -As 2>&1) + ret=$? + [ ${ret} -ne 0 ] && echo "${output}" + eend ${ret} fi -partitioned_devs=$(ls /dev/md_d* 2>/dev/null) -if [ -n "${partitioned_devs}" ]; then - ebegin "Creating RAID device partitions" - /sbin/blockdev ${partitioned_devs} - eend 0 - # wait because vgscan runs next, and we want udev to fire - sleep 1 +if [ -x /sbin/blockdev ] ; then + partitioned_devs=$(ls /dev/md_d* 2>/dev/null) + if [ -n "${partitioned_devs}" ]; then + ebegin "Creating RAID device partitions" + /sbin/blockdev ${partitioned_devs} + eend 0 + # wait because vgscan runs next, and we want udev to fire + sleep 1 + fi fi # vim:ts=4 |