From: NeilBrown <neilb@suse.de>
Date: Mon, 24 Jun 2013 05:44:36 +0000 (+1000)
Subject: test/00names: use appropriate mdadm.conf
X-Git-Tag: mdadm-3.3-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ccfd3be3089fef5d795bc3e6d39ac2c1c880009;p=thirdparty%2Fmdadm.git

test/00names: use appropriate mdadm.conf

Using non-numeric names needs an mdadm.conf setting,
so make sure we have one.

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

diff --git a/mdadm.c b/mdadm.c
index 3324a9b2..14005b3e 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -827,6 +827,7 @@ int main(int argc, char *argv[])
 		case O(MISC, ConfigFile):
 		case O(MONITOR,'c'):
 		case O(MONITOR,ConfigFile):
+		case O(CREATE,ConfigFile):
 			if (configfile) {
 				pr_err("configfile cannot be set twice.  "
 					"Second value is %s.\n", optarg);
diff --git a/tests/00names b/tests/00names
index c6630e2b..7a066d8f 100644
--- a/tests/00names
+++ b/tests/00names
@@ -1,10 +1,12 @@
 set -x -e
 
 # create arrays with non-numeric names
+conf=$targetdir/mdadm.conf
+echo "CREATE names=yes" > $conf
 
 for i in linear raid0 raid1 raid4 raid5 raid6
 do
-  mdadm -CR /dev/md/$i -l $i -n 4 $dev4 $dev3 $dev2 $dev1
+  mdadm -CR --config $conf /dev/md/$i -l $i -n 4 $dev4 $dev3 $dev2 $dev1
   check $i
   [ -d /sys/class/block/md_$i/md ]
   mdadm -S md_$i