1
From: martin f. krafft <madduck@debian.org>
2
Subject: Set /etc/mdadm/mdadm.conf as primary config file location
4
On Debian, the configuration file resides primarily in /etc/mdadm/mdadm.conf,
5
/etc/mdadm.conf is only used as a backup.
7
This is a Debian-specific patch.
10
Reviewed-by: martin f. krafft <madduck@debian.org>
15
mdadm.8.in | 14 ++++++--------
18
5 files changed, 11 insertions(+), 13 deletions(-)
20
diff --git a/Makefile b/Makefile
21
index e2c65a5..0e85ccb 100644
24
@@ -60,8 +60,8 @@ else
28
-CONFFILE = $(SYSCONFDIR)/mdadm.conf
29
-CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
30
+CONFFILE = $(SYSCONFDIR)/mdadm/mdadm.conf
31
+CONFFILE2 = $(SYSCONFDIR)/mdadm.conf
32
MAILCMD =/usr/sbin/sendmail -t
33
CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
34
# Both MAP_DIR and MDMON_DIR should be somewhere that persists across the
35
diff --git a/ReadMe.c b/ReadMe.c
36
index b97c55e..aa26032 100644
39
@@ -560,7 +560,7 @@ char Help_incr[] =
43
-"The /etc/mdadm.conf config file:\n\n"
44
+"The /etc/mdadm/mdadm.conf config file:\n\n"
45
" The config file contains, apart from blank lines and comment lines that\n"
46
" start with a hash(#), four sorts of configuration lines: array lines, \n"
47
" device lines, mailaddr lines and program lines.\n"
48
diff --git a/mdadm.8.in b/mdadm.8.in
49
index d911cb3..d267b8c 100644
52
@@ -261,9 +261,9 @@ the exact meaning of this option in different contexts.
54
.BR \-c ", " \-\-config=
55
Specify the config file. Default is to use
56
-.BR /etc/mdadm.conf ,
57
-or if that is missing then
58
-.BR /etc/mdadm/mdadm.conf .
59
+.BR /etc/mdadm/mdadm.conf ,
60
+or if that is missing, then
61
+.BR /etc/mdadm.conf .
62
If the config file given is
64
then nothing will be read, but
65
@@ -1429,8 +1429,6 @@ The config file is only used if explicitly named with
66
or requested with (a possibly implicit)
71
.B /etc/mdadm/mdadm.conf
74
@@ -1771,7 +1769,7 @@ or
76
will cause the output to be less detailed and the format to be
77
suitable for inclusion in
78
-.BR /etc/mdadm.conf .
79
+.BR /etc/mdadm/mdadm.conf .
82
will normally be 0 unless
83
@@ -1848,7 +1846,7 @@ or
84
is given, then multiple devices that are components of the one array
85
are grouped together and reported in a single entry suitable
87
-.BR /etc/mdadm.conf .
88
+.BR /etc/mdadm/mdadm.conf .
92
@@ -2545,7 +2543,7 @@ uses this to find arrays when
93
is given in Misc mode, and to monitor array reconstruction
97
+.SS /etc/mdadm/mdadm.conf
99
The config file lists which devices may be scanned to see if
100
they contain MD super block, and gives identifying information
101
diff --git a/mdadm.conf.5 b/mdadm.conf.5
102
index e677ba9..648d26a 100644
107
mdadm.conf \- configuration for management of Software RAID with mdadm
110
+/etc/mdadm/mdadm.conf
114
diff --git a/mdassemble.8 b/mdassemble.8
115
index 986432c..d06c201 100644
118
@@ -40,7 +40,7 @@ There are no options to
123
+.SS /etc/mdadm/mdadm.conf
125
The config file lists which devices may be scanned to see if
126
they contain MD super block, and gives identifying information
128
tg: (972ee72..) debian/conffile-location (depends on: upstream)