diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-11-10 00:27:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-11-10 00:27:10 +0000 |
| commit | bd35cfd05451b5d88cf1d005b8b2be444a61565d (patch) | |
| tree | 413ae1abae236db02e16697db7889c421e7ec516 /sys-fs/mdadm | |
| parent | Try not to install two logwatch cron files #145361 by Brian Wood. (diff) | |
| download | historical-bd35cfd05451b5d88cf1d005b8b2be444a61565d.tar.gz historical-bd35cfd05451b5d88cf1d005b8b2be444a61565d.tar.bz2 historical-bd35cfd05451b5d88cf1d005b8b2be444a61565d.zip | |
Check both /etc/mdadm/mdadm.conf and /etc/mdadm.conf #150050 by Henning Schild.
Package-Manager: portage-2.1.2_rc1-r5
Diffstat (limited to 'sys-fs/mdadm')
| -rw-r--r-- | sys-fs/mdadm/ChangeLog | 6 | ||||
| -rwxr-xr-x | sys-fs/mdadm/files/raid-start.sh | 8 | ||||
| -rw-r--r-- | sys-fs/mdadm/files/raid-stop.sh | 6 |
3 files changed, 14 insertions, 6 deletions
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog index 0b7ff7da6116..9f8caa1ef94b 100644 --- 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 47dfeffb2425..0ada6a8bf0a2 100755 --- 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 412f80c264f1..79ca0a8e9a94 100644 --- 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=$? |