commit 9649a16e4c0e679c0e5bc3e33d816943b85dd910 Author: Doug Ledford Date: Wed Mar 17 10:52:22 2010 -0400 mapfile: if we putting the mapfile in a custom location via ALT_RUN, allow a custom filename too. Signed-off-by: Doug Ledford diff --git a/Makefile b/Makefile index 1035ea8..2aafad0 100644 --- 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 950cf62..51d2b14 100644 --- 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) }; int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT | O_TRUNC };