diff options
| author | Doug Ledford <dledford@redhat.com> | 2010-04-02 10:53:47 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2010-04-13 12:55:35 -0400 |
| commit | 9f55479619c156538434921cbaac0bafa8bccb86 (patch) | |
| tree | 840c5cfbc5fdb92b02b3bc22ca8853a35355cffb /Makefile | |
| parent | b8d3bda04cbb5c5ff289b16f33401f9cef0a6dff (diff) | |
| download | mdadm-9f55479619c156538434921cbaac0bafa8bccb86.tar.gz mdadm-9f55479619c156538434921cbaac0bafa8bccb86.tar.xz mdadm-9f55479619c156538434921cbaac0bafa8bccb86.zip | |
Fix all the confusion over directories once and for all. We now have
3 directory definitions: mdmon directory for its pid and sock files,
mdmonitor directory which is for the mdadm monitor mode pid file and
can only be passed in via command line, and the directory for the
mdadm map file. Only the mdadm map file still hunts multiple locations,
and the number of locations has been reduced to /var/run and the
compile time specified location. I could see lowering that to just
1 location, but I didn't do that with this patch.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -58,16 +58,16 @@ CONFFILE = $(SYSCONFDIR)/mdadm.conf CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf MAILCMD =/usr/sbin/sendmail -t CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" -# ALT_RUN should be somewhere that persists across the pivotroot -# from early boot to late boot. +# Both MAP_DIR and MDMON_DIR should be somewhere that persists across the +# pivotroot from early boot to late boot. # 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)\" -DALT_MAPFILE=\"$(ALT_MAPFILE)\" -VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\" -CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) $(VARFLAGS) +# e.g. make MAP_DIR=/dev/.mdadm +MAP_DIR = /lib/init/rw/mdadm +MAP_FILE = map +MDMON_DIR = /lib/init/rw/mdmon +DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" +DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" +CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) # If you want a static binary, you might uncomment these # LDFLAGS = -static |