diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-04-04 21:58:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-04-04 21:58:34 +0000 |
| commit | 0302a9dfb8e44775e0338d2a6f815ddce647af09 (patch) | |
| tree | f06c2bb24bb46b595db172fe7183e831e1945d97 /sys-fs/mdadm | |
| parent | Mark ia64/ppc64/sparc stable #520342. (diff) | |
| download | gentoo-2-0302a9dfb8e44775e0338d2a6f815ddce647af09.tar.gz gentoo-2-0302a9dfb8e44775e0338d2a6f815ddce647af09.tar.bz2 gentoo-2-0302a9dfb8e44775e0338d2a6f815ddce647af09.zip | |
Add a conf.d setting to pass options to the assemble step #531604 by Adrian.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-fs/mdadm')
| -rw-r--r-- | sys-fs/mdadm/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/mdadm/files/mdraid.confd | 6 | ||||
| -rw-r--r-- | sys-fs/mdadm/files/mdraid.rc | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog index 69595244a12f..a04c8293180d 100644 --- a/sys-fs/mdadm/ChangeLog +++ b/sys-fs/mdadm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/mdadm # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.192 2015/04/04 21:48:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.193 2015/04/04 21:58:34 vapier Exp $ + + 04 Apr 2015; Mike Frysinger <vapier@gentoo.org> files/mdraid.confd, + files/mdraid.rc: + Add a conf.d setting to pass options to the assemble step #531604 by Adrian. 04 Apr 2015; Mike Frysinger <vapier@gentoo.org> mdadm-3.3.1-r2.ebuild: Mark ia64/ppc64/sparc stable #520342. diff --git a/sys-fs/mdadm/files/mdraid.confd b/sys-fs/mdadm/files/mdraid.confd index daa17abd8740..5694d732d006 100644 --- a/sys-fs/mdadm/files/mdraid.confd +++ b/sys-fs/mdadm/files/mdraid.confd @@ -3,3 +3,9 @@ # For people who run raid on top of some other layer (like # dmcrypt), use rc_need to specify that requirement. See # the runscript(8) man page for more information. + +# Most configuration happens in /etc/mdadm.conf. + +# Pass additional options when assembling raids. +# Note: This applies to all raids. +MDADM_ASSEMBLE_OPTS="" diff --git a/sys-fs/mdadm/files/mdraid.rc b/sys-fs/mdadm/files/mdraid.rc index 27421e26ec20..1ba25541eb8a 100644 --- a/sys-fs/mdadm/files/mdraid.rc +++ b/sys-fs/mdadm/files/mdraid.rc @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc,v 1.6 2011/11/12 21:06:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc,v 1.7 2015/04/04 21:58:33 vapier Exp $ depend() { before checkfs fsck @@ -12,7 +12,7 @@ start() { local output ebegin "Starting up RAID devices" - output=$(mdadm -As 2>&1) + output=$(mdadm -As ${MDADM_ASSEMBLE_OPTS} 2>&1) eend $? "${output}" local pat="/dev/md_d*" |