summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin f. krafft <madduck@debian.org>2018-05-15 12:10:33 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2018-05-15 12:10:33 +0100
commitbb29ccb7241e6871fa4ef008d45b7c0dade873bc (patch)
tree08d471aedc46d75ee4e4bd5d3f50abd64cf85f88
parent0a7e47e72a9ceaecdeeb960a511281b6fe5b5b4e (diff)
Set /etc/mdadm/mdadm.conf as primary config file location
On Debian, the configuration file resides primarily in /etc/mdadm/mdadm.conf, /etc/mdadm.conf is only used as a backup. This is a Debian-specific patch. Forwarded: not-needed Reviewed-by: martin f. krafft <madduck@debian.org> Gbp-Pq: Name debian-conffile-location.diff
-rw-r--r--Makefile4
-rw-r--r--ReadMe.c2
-rw-r--r--mdadm.8.in16
-rw-r--r--mdadm.conf.52
4 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 188a218..cb5759b 100644
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,8 @@ CPPFLAGS += -DBINDIR=\"$(BINDIR)\"
PKG_CONFIG ?= pkg-config
SYSCONFDIR = /etc
-CONFFILE = $(SYSCONFDIR)/mdadm.conf
-CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
+CONFFILE = $(SYSCONFDIR)/mdadm/mdadm.conf
+CONFFILE2 = $(SYSCONFDIR)/mdadm.conf
MAILCMD =/usr/sbin/sendmail -t
CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
# Both MAP_DIR and MDMON_DIR should be somewhere that persists across the
diff --git a/ReadMe.c b/ReadMe.c
index 27121da..db83398 100644
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -609,7 +609,7 @@ char Help_incr[] =
;
char Help_config[] =
-"The /etc/mdadm.conf config file:\n\n"
+"The /etc/mdadm/mdadm.conf config file:\n\n"
" The config file contains, apart from blank lines and comment lines that\n"
" start with a hash(#), array lines, device lines, and various\n"
" configuration lines.\n"
diff --git a/mdadm.8.in b/mdadm.8.in
index ea45bbc..eeea6e4 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
@@ -1952,9 +1952,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
@@ -3276,7 +3276,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
@@ -3284,7 +3284,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.
diff --git a/mdadm.conf.5 b/mdadm.conf.5
index 18512cb..542e263 100644
--- a/mdadm.conf.5
+++ b/mdadm.conf.5
@@ -8,7 +8,7 @@
.SH NAME
mdadm.conf \- configuration for management of Software RAID with mdadm
.SH SYNOPSIS
-/etc/mdadm.conf
+/etc/mdadm/mdadm.conf
.SH DESCRIPTION
.PP
.I mdadm