Assume "DEVICE partitions" if no DEVICE line present.

This means the output of "mdadm -Es" can be used as a complete
mdadm.conf file .... if you really want to do that.

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

diff --git a/ChangeLog b/ChangeLog
index 64b760aa3130bacf002dd4786a527898f3dbccfe..28e6240fc5ad28178b13a075a31d290a8741278b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Changes Prior to this release
        emails can be explicitly set.
     -   Arrange that SparesMissing (which is similar in import to
        DegradedArray) generates an Email.
+    -   Assume "DEVICE partitions" if no DEVICE line is given.
 
 Changes Prior to 2.4.1 release
     -   Honour --write-mostly when adding to an array without persistent

diff --git a/config.c b/config.c
index b1f51d9003d6636e05c05e6b9c5d59408dd0e98d..0388b5e45db8bc7a2bd354d89ef58f96e22ed75b 100644 (file)
--- a/config.c
+++ b/config.c
@@ -569,7 +569,11 @@ mddev_dev_t conf_get_devs(char *conffile)
        }
     
        load_conffile(conffile);
-    
+
+       if (cdevlist == NULL)
+               /* default to 'partitions */
+               dlist = load_partitions();
+
        for (cd=cdevlist; cd; cd=cd->next) {
                if (strcasecmp(cd->name, "partitions")==0 && dlist == NULL)
                        dlist = load_partitions();

diff --git a/mdadm.conf.5 b/mdadm.conf.5
index f96476c43924745dcbe82371b79c6fbf1ddc1f4f..56a5444c33aa5ba67e760320e826a5fbb62bdf61 100644 (file)
--- a/mdadm.conf.5
+++ b/mdadm.conf.5
@@ -61,6 +61,8 @@ but only the major and minor device numbers.  It scans
 .I /dev
 to find the name that matches the numbers.
 
+If no DEVICE line is present, then "DEVICE partitions" is assumed.
+
 For example:
 .IP
 DEVICE /dev/hda* /dev/hdc*