Merge branch 'master' into scratch-3.0

diff --git a/mapfile.c b/mapfile.c
index 955a1f98a243c1844b22a65d50909b42c9708c30..14b6df4cae765ab49182680c47a8d2c865f10ef0 100644 (file)
--- a/mapfile.c
+++ b/mapfile.c
@@ -53,7 +53,7 @@ int map_write(struct map_ent *mel)
        f = fopen("/var/run/mdadm/map.new", "w");
        if (!f) {
                f = fopen("/var/run/mdadm.map.new", "w");
-               subdir = 1;
+               subdir = 0;
        }
        if (!f)
                return 0;