diff options
Diffstat (limited to 'debian/patches/debian-conffile-location.diff')
| -rw-r--r-- | debian/patches/debian-conffile-location.diff | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/debian/patches/debian-conffile-location.diff b/debian/patches/debian-conffile-location.diff index e3b3e9bf..26b9a020 100644 --- a/debian/patches/debian-conffile-location.diff +++ b/debian/patches/debian-conffile-location.diff @@ -17,9 +17,11 @@ Reviewed-by: martin f. krafft <madduck@debian.org> mdassemble.8 | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) ---- a/Makefile -+++ b/Makefile -@@ -68,8 +68,8 @@ +Index: mdadm-4.1/Makefile +=================================================================== +--- mdadm-4.1.orig/Makefile ++++ mdadm-4.1/Makefile +@@ -72,8 +72,8 @@ CPPFLAGS += -DBINDIR=\"$(BINDIR)\" PKG_CONFIG ?= pkg-config SYSCONFDIR = /etc @@ -30,9 +32,11 @@ Reviewed-by: martin f. krafft <madduck@debian.org> MAILCMD =/usr/sbin/sendmail -t CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" # Both MAP_DIR and MDMON_DIR should be somewhere that persists across the ---- a/ReadMe.c -+++ b/ReadMe.c -@@ -609,7 +609,7 @@ +Index: mdadm-4.1/ReadMe.c +=================================================================== +--- mdadm-4.1.orig/ReadMe.c ++++ mdadm-4.1/ReadMe.c +@@ -609,7 +609,7 @@ char Help_incr[] = ; char Help_config[] = @@ -41,9 +45,11 @@ Reviewed-by: martin f. krafft <madduck@debian.org> " 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" ---- a/mdadm.8.in -+++ b/mdadm.8.in -@@ -267,13 +267,13 @@ +Index: mdadm-4.1/mdadm.8.in +=================================================================== +--- mdadm-4.1.orig/mdadm.8.in ++++ mdadm-4.1/mdadm.8.in +@@ -267,13 +267,13 @@ the exact meaning of this option in diff .TP .BR \-c ", " \-\-config= Specify the config file or directory. Default is to use @@ -61,7 +67,7 @@ Reviewed-by: martin f. krafft <madduck@debian.org> If the config file given is .B "partitions" then nothing will be read, but -@@ -1952,9 +1952,9 @@ +@@ -1952,9 +1952,9 @@ The config file is only used if explicit or requested with (a possibly implicit) .BR \-\-scan . In the later case, @@ -73,7 +79,7 @@ Reviewed-by: martin f. krafft <madduck@debian.org> is used. If -@@ -3276,7 +3276,7 @@ +@@ -3264,7 +3264,7 @@ uses this to find arrays when is given in Misc mode, and to monitor array reconstruction on Monitor mode. @@ -82,7 +88,7 @@ Reviewed-by: martin f. krafft <madduck@debian.org> 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 @@ +@@ -3272,7 +3272,7 @@ they contain MD super block, and gives i .BR mdadm.conf (5) for more details. @@ -91,8 +97,10 @@ Reviewed-by: martin f. krafft <madduck@debian.org> A directory containing configuration files which are read in lexical order. ---- a/mdadm.conf.5 -+++ b/mdadm.conf.5 +Index: mdadm-4.1/mdadm.conf.5 +=================================================================== +--- mdadm-4.1.orig/mdadm.conf.5 ++++ mdadm-4.1/mdadm.conf.5 @@ -8,7 +8,7 @@ .SH NAME mdadm.conf \- configuration for management of Software RAID with mdadm |