mapfile: if we putting the mapfile in a custom location via ALT_RUN, allow

a custom filename too.

Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/Makefile b/Makefile
index 1035ea8072bdd0d597d6a823b56bf431b33bb8c6..2aafad0fa46cc392b1ca7c663c54a59902e7af05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
 # If you don't have /lib/init/rw you might want to use /dev/.something
 #  e.g. make ALT_RUN=/dev/.mdadm
 ALT_RUN = /lib/init/rw
+ALT_MAPFILE = map
 VAR_RUN = /var/run
-ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\"
+ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" -DALT_MAPFILE=\"$(ALT_MAPFILE)\"
 VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\"
 CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) $(VARFLAGS)
 

diff --git a/mapfile.c b/mapfile.c
index 89187ac35ea95b48df33fb7a19555cc96ef56909..74f72560e32b144a0707c3f15fe4599341f797b9 100644 (file)
--- a/mapfile.c
+++ b/mapfile.c
@@ -55,7 +55,7 @@
 char *mapname[3][3] = {
        mapnames(VAR_RUN "/map"),
        mapnames("/var/run/mdadm.map"),
-       mapnames(ALT_RUN "/map")
+       mapnames(ALT_RUN "/" ALT_MAPFILE)
 };
 char *mapdir[3] = { VAR_RUN, NULL, ALT_RUN };
 

diff --git a/mdadm.h b/mdadm.h
index 362b66b1a874c12a78f04dfd0a2d4236911c0984..0386129d62bf7c5ba30ebba52addb9cb17f7590a 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -87,6 +87,9 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
 #ifndef ALT_RUN
 #define ALT_RUN "/lib/init/rw/mdadm"
 #endif /* ALT_RUN */
+#ifndef ALT_MAPFILE
+#define ALT_MAPFILE "map"
+#endif /* ALT_MAPFILE */
 
 #include       "md_u.h"
 #include       "md_p.h"