Check both /etc/mdadm/mdadm.conf and /etc/mdadm.conf #150050 by Henning Schild.

Package-Manager: portage-2.1.2_rc1-r5

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 0b7ff7da6116271cada410f8ff9cf1fa8729efc3..9f8caa1ef94b6a4ffb8483f8723df3b20e3c5140 100644 (file)
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.51 2006/10/26 19:53:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.52 2006/11/10 00:27:07 vapier Exp $
+
+  10 Nov 2006; Mike Frysinger <vapier@gentoo.org> files/raid-start.sh,
+  files/raid-stop.sh:
+  Check both /etc/mdadm/mdadm.conf and /etc/mdadm.conf #150050 by Henning Schild.
 
 *mdadm-2.5.5 (26 Oct 2006)
 

diff --git a/sys-fs/mdadm/files/raid-start.sh b/sys-fs/mdadm/files/raid-start.sh
index 47dfeffb2425ca3d6adf9e85b224127e29e188c2..0ada6a8bf0a287d297b66470bc1543d1b975e176 100755 (executable)
--- a/sys-fs/mdadm/files/raid-start.sh
+++ b/sys-fs/mdadm/files/raid-start.sh
@@ -1,7 +1,7 @@
 # /lib/rcscripts/addons/raid-start.sh:  Setup raid volumes at boot
 # Copyright 1999-2005 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,v 1.4 2005/06/10 02:09:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-start.sh,v 1.5 2006/11/10 00:27:07 vapier Exp $
 
 [[ -f /proc/mdstat ]] || exit 0
 
@@ -38,8 +38,10 @@ if [[ -x /sbin/raidstart && -f /etc/raidtab ]] ; then
 fi
 
 # Start software raid with mdadm (new school)
-if [[ -x /sbin/mdadm && -f /etc/mdadm.conf ]] ; then
-       devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' /etc/mdadm.conf)
+mdadm_conf="/etc/mdadm/mdadm.conf"
+[[ -e /etc/mdadm.conf ]] && mdadm_conf="/etc/mdadm.conf"
+if [[ -x /sbin/mdadm && -f ${mdadm_conf} ]] ; then
+       devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' ${mdadm_conf})
        if [[ -n ${devs} ]] ; then
                create_devs ${devs}
                ebegin "Starting up RAID devices (mdadm)"

diff --git a/sys-fs/mdadm/files/raid-stop.sh b/sys-fs/mdadm/files/raid-stop.sh
index 412f80c264f1ea613e2398eda855620fe3be8120..79ca0a8e9a94f5ffaeb5d0335680d2b6cd76af74 100644 (file)
--- a/sys-fs/mdadm/files/raid-stop.sh
+++ b/sys-fs/mdadm/files/raid-stop.sh
@@ -1,7 +1,7 @@
 # /lib/rcscripts/addons/raid-stop.sh:  Stop raid volumes at shutdown
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-stop.sh,v 1.1 2005/06/10 01:35:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-stop.sh,v 1.2 2006/11/10 00:27:07 vapier Exp $
 
 [[ -f /proc/mdstat ]] || exit 0
 
@@ -15,7 +15,9 @@ if [[ -x /sbin/raidstop && -f /etc/raidtab ]] ; then
 fi
 
 # Stop software raid with mdadm (new school)
-if [[ -x /sbin/mdadm && -f /etc/mdadm.conf ]] ; then
+mdadm_conf="/etc/mdadm/mdadm.conf"
+[[ -e /etc/mdadm.conf ]] && mdadm_conf="/etc/mdadm.conf"
+if [[ -x /sbin/mdadm && -f ${mdadm_conf} ]] ; then
        ebegin "Shutting down RAID devices (mdadm)"
        output=$(mdadm -Ss 2>&1)
        ret=$?

diff --git a/sys-fs/raidtools/ChangeLog b/sys-fs/raidtools/ChangeLog
index a95d3e67e584deb655e13bd9b4c1f42aae3ca74a..7429b63cad60cc334f69505246e2b7ce94755f4c 100644 (file)
--- a/sys-fs/raidtools/ChangeLog
+++ b/sys-fs/raidtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/raidtools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/ChangeLog,v 1.25 2006/03/09 23:56:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/ChangeLog,v 1.26 2006/11/10 00:27:10 vapier Exp $
+
+  10 Nov 2006; Mike Frysinger <vapier@gentoo.org> files/raid-start.sh,
+  files/raid-stop.sh:
+  Check both /etc/mdadm/mdadm.conf and /etc/mdadm.conf #150050 by Henning Schild.
 
   09 Mar 2006; Mike Frysinger <vapier@gentoo.org>
   +files/raidtools-1.00.3-build.patch, raidtools-1.00.3-r6.ebuild:

diff --git a/sys-fs/raidtools/files/digest-raidtools-1.00.3-r6 b/sys-fs/raidtools/files/digest-raidtools-1.00.3-r6
index 8b9f5451a2c5d00b13fae789e3941077e7f1bf56..15fe15d9a1ea08cfa2197c1a2c5e8076b9c47a7e 100644 (file)
--- a/sys-fs/raidtools/files/digest-raidtools-1.00.3-r6
+++ b/sys-fs/raidtools/files/digest-raidtools-1.00.3-r6
@@ -1 +1,3 @@
 MD5 cb41f8093cd7381ee07adb2951cc53fa raidtools-1.00.3.tar.gz 167779
+RMD160 74619f9c87422fe8a8593ba369c3f3688141f46f raidtools-1.00.3.tar.gz 167779
+SHA256 1894f13b3e295a83f27e951d10442fc8fefe33284b0db637c83dd95bdc44b1f5 raidtools-1.00.3.tar.gz 167779

diff --git a/sys-fs/raidtools/files/raid-start.sh b/sys-fs/raidtools/files/raid-start.sh
index 652b319dcdea31f008dd38e3db044746e4c6a4bc..dcd695febf845f4ba186ae88520bfa6373ea4e56 100755 (executable)
--- a/sys-fs/raidtools/files/raid-start.sh
+++ b/sys-fs/raidtools/files/raid-start.sh
@@ -1,7 +1,7 @@
 # /lib/rcscripts/addons/raid-start.sh:  Setup raid volumes at boot
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/files/raid-start.sh,v 1.5 2005/06/10 02:09:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/files/raid-start.sh,v 1.6 2006/11/10 00:27:10 vapier Exp $
 
 [[ -f /proc/mdstat ]] || exit 0
 
@@ -38,8 +38,10 @@ if [[ -x /sbin/raidstart && -f /etc/raidtab ]] ; then
 fi
 
 # Start software raid with mdadm (new school)
-if [[ -x /sbin/mdadm && -f /etc/mdadm.conf ]] ; then
-       devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' /etc/mdadm.conf)
+mdadm_conf="/etc/mdadm/mdadm.conf"
+[[ -e /etc/mdadm.conf ]] && mdadm_conf="/etc/mdadm.conf"
+if [[ -x /sbin/mdadm && -f ${mdadm_conf} ]] ; then
+       devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' ${mdadm_conf})
        if [[ -n ${devs} ]] ; then
                create_devs ${devs}
                ebegin "Starting up RAID devices (mdadm)"

diff --git a/sys-fs/raidtools/files/raid-stop.sh b/sys-fs/raidtools/files/raid-stop.sh
index fafd41422b83f1c59f6f7ccb264edae0afbd84ad..7b66efc53770b170af9cbc69eaa0b77c6b1bd2ee 100644 (file)
--- a/sys-fs/raidtools/files/raid-stop.sh
+++ b/sys-fs/raidtools/files/raid-stop.sh
@@ -1,7 +1,7 @@
 # /lib/rcscripts/addons/raid-stop.sh:  Stop raid volumes at shutdown
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/files/raid-stop.sh,v 1.1 2005/06/10 01:34:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/files/raid-stop.sh,v 1.2 2006/11/10 00:27:10 vapier Exp $
 
 [[ -f /proc/mdstat ]] || exit 0
 
@@ -15,7 +15,9 @@ if [[ -x /sbin/raidstop && -f /etc/raidtab ]] ; then
 fi
 
 # Stop software raid with mdadm (new school)
-if [[ -x /sbin/mdadm && -f /etc/mdadm.conf ]] ; then
+mdadm_conf="/etc/mdadm/mdadm.conf"
+[[ -e /etc/mdadm.conf ]] && mdadm_conf="/etc/mdadm.conf"
+if [[ -x /sbin/mdadm && -f ${mdadm_conf} ]] ; then
        ebegin "Shutting down RAID devices (mdadm)"
        output=$(mdadm -Ss 2>&1)
        ret=$?