NeilBrown: mapfile: use ALT_RUN as alternate place to store mapfile

Martin F. Krafft madduck at alioth.debian.org
Mon May 24 09:21:00 UTC 2010


Module: mdadm
Branch: upstream
Commit: 319767b85c2b16d80c235195329470c46d4547b3
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=319767b85c2b16d80c235195329470c46d4547b3

Author: NeilBrown <neilb at suse.de>
Date:   Mon Feb  8 14:33:31 2010 +1100

mapfile: use ALT_RUN as alternate place to store mapfile

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

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

---

 mapfile.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mapfile.c b/mapfile.c
index 5444452..366ebe3 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 };




More information about the pkg-mdadm-commits mailing list