68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
--- mdadm-3.1.3-git20100804/Makefile.static 2010-07-28 23:50:15.000000000 -0400
|
|
+++ mdadm-3.1.3-git20100804/Makefile 2010-08-04 11:28:08.603342301 -0400
|
|
@@ -68,9 +68,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)
|
|
# pivotroot from early boot to late boot.
|
|
# /dev is an odd place to put this, but it is the only directory that
|
|
# meets the requirements.
|
|
-MAP_DIR=/dev/.mdadm
|
|
-MAP_FILE = map
|
|
-MDMON_DIR = /dev/.mdadm
|
|
+MAP_DIR=/dev/md
|
|
+MAP_FILE = md-device-map
|
|
+MDMON_DIR = /dev/md
|
|
DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
|
|
DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
|
|
CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)
|
|
@@ -165,9 +165,8 @@ mdadm.O2 : $(SRCS) mdadm.h mdmon.O2
|
|
mdmon.O2 : $(MON_SRCS) mdadm.h mdmon.h
|
|
$(CC) -o mdmon.O2 $(CFLAGS) $(LDFLAGS) -DHAVE_STDINT_H -O2 -D_FORTIFY_SOURCE=2 $(MON_SRCS)
|
|
|
|
-# use '-z now' to guarantee no dynamic linker interactions with the monitor thread
|
|
mdmon : $(MON_OBJS)
|
|
- $(CC) $(LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
|
|
+ $(CC) $(LDFLAGS) -o mdmon $(MON_OBJS) $(LDLIBS)
|
|
msg.o: msg.c msg.h
|
|
|
|
test_stripe : restripe.c mdadm.h
|
|
@@ -224,16 +223,16 @@ install : mdadm mdmon install-man instal
|
|
$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
|
|
|
|
install-static : mdadm.static install-man
|
|
- $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
|
|
+ $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm.static
|
|
|
|
install-tcc : mdadm.tcc install-man
|
|
- $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm
|
|
+ $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm.tcc
|
|
|
|
install-uclibc : mdadm.uclibc install-man
|
|
- $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm
|
|
+ $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm.uclibc
|
|
|
|
install-klibc : mdadm.klibc install-man
|
|
- $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
|
|
+ $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm.klibc
|
|
|
|
install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
|
|
$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
|
|
--- mdadm-3.1.3-git20100804/mapfile.c.static 2010-07-28 23:50:15.000000000 -0400
|
|
+++ mdadm-3.1.3-git20100804/mapfile.c 2010-08-04 11:27:35.391342438 -0400
|
|
@@ -60,9 +60,15 @@
|
|
dir "/" base ".lock", \
|
|
dir }
|
|
|
|
-#define MAP_DIRS 2
|
|
+/*
|
|
+ * one ring to bind them all...
|
|
+ *
|
|
+ * We only use a single map file location. The multiple locations issue
|
|
+ * has caused more confusion than it was worth.
|
|
+ * Doug Ledford <dledford@redhat.com>
|
|
+ */
|
|
+#define MAP_DIRS 1
|
|
char *mapname[MAP_DIRS][4] = {
|
|
- mapnames("/var/run/mdadm", "map"),
|
|
mapnames(MAP_DIR, MAP_FILE),
|
|
};
|
|
|