martin f. krafft: put conffile location changes into debian/ conffile-location branch

[Martin F. Krafft]

Module: mdadm
Branch: build
Commit: 9f76d4a766eb9730e3de80089865cb90dc94b11c
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=9f76d4a766eb9730e3de80089865cb90dc94b11c

Author: martin f. krafft <madduck at debian.org>
Date:   Tue Oct 27 17:53:15 2009 +0100

put conffile location changes into debian/conffile-location branch

Signed-off-by: martin f. krafft <madduck at debian.org>

---

 Makefile     |    4 ++--
 ReadMe.c     |    2 +-
 debian/rules |    2 +-
 mdadm.8      |   14 ++++++++------
 mdadm.conf.5 |    2 +-
 mdassemble.8 |    2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 2b8b17c..5636392 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,8 @@ CPPFLAGS=
 endif
 
 SYSCONFDIR = /etc
-CONFFILE = $(SYSCONFDIR)/mdadm/mdadm.conf
-CONFFILE2 = $(SYSCONFDIR)/mdadm.conf
+CONFFILE = $(SYSCONFDIR)/mdadm.conf
+CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
 MAILCMD =/usr/sbin/sendmail -t
 CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
 CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS)
diff --git a/ReadMe.c b/ReadMe.c
index f84c26a..6a5c83c 100644
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -547,7 +547,7 @@ char Help_incr[] =
 ;
 
 char Help_config[] =
-"The /etc/mdadm/mdadm.conf config file:\n\n"
+"The /etc/mdadm.conf config file:\n\n"
 " The config file contains, apart from blank lines and comment lines that\n"
 " start with a hash(#), four sorts of configuration lines: array lines, \n"
 " device lines, mailaddr lines and program lines.\n"
diff --git a/debian/rules b/debian/rules
index 9bfa645..965f603 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 
 #export DH_VERBOSE=1
 
-TG_BRANCHES="fixes/udev-blkid contrib/docs/raid5-vs-raid10 contrib/docs/superblock_formats contrib/docs/md.txt"
+TG_BRANCHES="fixes/udev-blkid contrib/docs/raid5-vs-raid10 contrib/docs/superblock_formats contrib/docs/md.txt debian/conffile-location"
 
 include /usr/share/quilt/quilt.make
 -include /usr/share/topgit/tg2quilt.mk
diff --git a/mdadm.8 b/mdadm.8
index 27ff45c..45579ff 100644
--- a/mdadm.8
+++ b/mdadm.8
@@ -267,9 +267,9 @@ the exact meaning of this option in different contexts.
 .TP
 .BR \-c ", " \-\-config=
 Specify the config file.  Default is to use
-.BR /etc/mdadm/mdadm.conf ,
-or if that is missing, then
-.BR /etc/mdadm.conf .
+.BR /etc/mdadm.conf ,
+or if that is missing then
+.BR /etc/mdadm/mdadm.conf .
 If the config file given is
 .B "partitions"
 then nothing will be read, but
@@ -1320,6 +1320,8 @@ 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
 is used.
 
@@ -1641,7 +1643,7 @@ or
 .B \-\-scan
 will cause the output to be less detailed and the format to be
 suitable for inclusion in
-.BR /etc/mdadm/mdadm.conf .
+.BR /etc/mdadm.conf .
 The exit status of
 .I mdadm
 will normally be 0 unless
@@ -1696,7 +1698,7 @@ or
 is given, then multiple devices that are components of the one array
 are grouped together and reported in a single entry suitable
 for inclusion in
-.BR /etc/mdadm/mdadm.conf .
+.BR /etc/mdadm.conf .
 
 Having
 .B \-\-scan
@@ -2320,7 +2322,7 @@ uses this to find arrays when
 is given in Misc mode, and to monitor array reconstruction
 on Monitor mode.
 
-.SS /etc/mdadm/mdadm.conf
+.SS /etc/mdadm.conf
 
 The config file lists which devices may be scanned to see if
 they contain MD super block, and gives identifying information
diff --git a/mdadm.conf.5 b/mdadm.conf.5
index efe066f..002e2b3 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/mdadm.conf
+/etc/mdadm.conf
 .SH DESCRIPTION
 .PP
 .I mdadm
diff --git a/mdassemble.8 b/mdassemble.8
index 1c11d17..b9c6b48 100644
--- a/mdassemble.8
+++ b/mdassemble.8
@@ -40,7 +40,7 @@ There are no options to
 
 .SH FILES
 
-.SS /etc/mdadm/mdadm.conf
+.SS /etc/mdadm.conf
 
 The config file lists which devices may be scanned to see if
 they contain MD super block, and gives identifying information