summaryrefslogtreecommitdiff
path: root/mdadm.8.in
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2016-02-19 16:28:38 +0000
committerDimitri John Ledkov <xnox@ubuntu.com>2016-02-19 16:28:38 +0000
commit3daa86f837ad5bd61f2240a6a0303b19397e0e31 (patch)
tree91f2e62a4a852350347a07f35e1621eb529ca745 /mdadm.8.in
parent7e15cddececa359fa92a1a58e4a0c360e13058c1 (diff)
Drop use-tempnode-not-devnode.patch, not needed anymore.debian/3.4-1
* Drop use-tempnode-not-devnode.patch, not needed anymore. * Drop use-external-blkid.diff. (Closes: #793631)
Diffstat (limited to 'mdadm.8.in')
-rw-r--r--mdadm.8.in16
1 files changed, 8 insertions, 8 deletions
diff --git a/mdadm.8.in b/mdadm.8.in
index 50be1aa..7bae49d 100644
--- a/mdadm.8.in
+++ b/mdadm.8.in
@@ -267,13 +267,13 @@ the exact meaning of this option in different contexts.
.TP
.BR \-c ", " \-\-config=
Specify the config file or directory. Default is to use
-.B /etc/mdadm.conf
+.B /etc/mdadm/mdadm.conf
and
-.BR /etc/mdadm.conf.d ,
+.BR /etc/mdadm/mdadm.conf.d ,
or if those are missing then
-.B /etc/mdadm/mdadm.conf
+.B /etc/mdadm.conf
and
-.BR /etc/mdadm/mdadm.conf.d .
+.BR /etc/mdadm.conf.d .
If the config file given is
.B "partitions"
then nothing will be read, but
@@ -1849,9 +1849,9 @@ The config file is only used if explicitly named with
or requested with (a possibly implicit)
.BR \-\-scan .
In the later case,
-.B /etc/mdadm.conf
-or
.B /etc/mdadm/mdadm.conf
+or
+.B /etc/mdadm.conf
is used.
If
@@ -3145,7 +3145,7 @@ uses this to find arrays when
is given in Misc mode, and to monitor array reconstruction
on Monitor mode.
-.SS /etc/mdadm.conf
+.SS /etc/mdadm/mdadm.conf (or /etc/mdadm.conf)
The config file lists which devices may be scanned to see if
they contain MD super block, and gives identifying information
@@ -3153,7 +3153,7 @@ they contain MD super block, and gives identifying information
.BR mdadm.conf (5)
for more details.
-.SS /etc/mdadm.conf.d
+.SS /etc/mdadm/mdadm.conf.d (or /etc/mdadm.conf.d)
A directory containing configuration files which are read in lexical
order.