From 96fd06edce9ae2d41908b9703642dfe50f376ca9 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 3 May 2012 14:16:56 +1000 Subject: Adjust to new standard of /run Now that /run seems to be a good standard, make that the default for storing various run-time files, rather than /var/run or /dev/.mdadm. Signed-off-by: NeilBrown --- mapfile.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'mapfile.c') diff --git a/mapfile.c b/mapfile.c index 9e2c8936..b890ed2b 100644 --- a/mapfile.c +++ b/mapfile.c @@ -38,27 +38,19 @@ * UUID - uuid of the array * path - path where device created: /dev/md/home * - * The best place for the mapfile wold be /var/run/mdadm/map. However - * it is needed during initramfs early-boot, and /var/run doesn't exist there - * and certainly doesn't persist through to normal boot. - * So we store it in /dev/.mdadm/map but allow this to be changed at - * compile time. via MAP_DIR and MAP_FILE - * + * The best place for the mapfile is /run/mdadm/map. Distros and users + * which have not switched to /run yet can choose a different location + * at compile time via MAP_DIR and MAP_FILE. */ #include "mdadm.h" #include #include -#ifndef MAP_DIR -#define MAP_DIR "/dev/.mdadm" -#define MAP_FILE "map" -#endif #define MAP_READ 0 #define MAP_NEW 1 #define MAP_LOCK 2 #define MAP_DIRNAME 3 -#define mapnames(dir, base) { \ char *mapname[4] = { MAP_DIR "/" MAP_FILE, -- cgit v1.2.3