From: NeilBrown <neilb@suse.de>
Date: Mon, 8 Feb 2010 03:33:31 +0000 (+1100)
Subject: mapfile: use ALT_RUN as alternate place to store mapfile
X-Git-Tag: mdadm-3.1.2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=319767b85c2b16d80c235195329470c46d4547b3;p=thirdparty%2Fmdadm.git

mapfile: use ALT_RUN as alternate place to store mapfile

This gives better consistency and fewer hidden '.' files.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/mapfile.c b/mapfile.c
index 5444452d..366ebe33 100644
--- a/mapfile.c
+++ b/mapfile.c
@@ -51,11 +51,11 @@
 #include	<sys/file.h>
 #include	<ctype.h>
 
-#define mapnames(base) { #base, #base ".new", #base ".lock"}
+#define mapnames(base) { base, base ".new", base ".lock"}
 char *mapname[3][3] = {
-	mapnames(/var/run/mdadm/map),
-	mapnames(/var/run/mdadm.map),
-	mapnames(/dev/.mdadm.map)
+	mapnames(VAR_RUN "/map"),
+	mapnames("/var/run/mdadm.map"),
+	mapnames(ALT_RUN "/map")
 };
 
 int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT | O_TRUNC };