diff options
| author | Neil Brown <neilb@suse.de> | 2006-06-26 15:11:01 +1000 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2006-06-26 15:11:01 +1000 |
| commit | 8aec876d2ee877ea86a67461237c2a8f5a43a5ab (patch) | |
| tree | 2acfdc50c8e7ef27208d8b4533d7b97fdd46a0bc /mdassemble.c | |
| parent | 8bd2e0c3390e54c1f1fa0daa701dd44e28f5e18d (diff) | |
| download | mdadm-8aec876d2ee877ea86a67461237c2a8f5a43a5ab.tar.gz mdadm-8aec876d2ee877ea86a67461237c2a8f5a43a5ab.tar.xz mdadm-8aec876d2ee877ea86a67461237c2a8f5a43a5ab.zip | |
More consistent honoring of --configfile
Never use /etc/mdadm.conf if --config file is given (previously
some code used one, some used the other).
Diffstat (limited to 'mdassemble.c')
| -rw-r--r-- | mdassemble.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mdassemble.c b/mdassemble.c index 85b695c..1de5688 100644 --- a/mdassemble.c +++ b/mdassemble.c @@ -71,7 +71,6 @@ int open_mddev(char *dev, int autof/*unused */) } #endif -char *configfile = NULL; int rv; int mdfd = -1; int runstop = 0; @@ -80,7 +79,7 @@ int verbose = 0; int force = 0; int main(int argc, char *argv[]) { - mddev_ident_t array_list = conf_get_ident(configfile, NULL); + mddev_ident_t array_list = conf_get_ident(NULL); if (!array_list) { fprintf(stderr, Name ": No arrays found in config file\n"); rv = 1; @@ -96,7 +95,7 @@ int main(int argc, char *argv[]) { /* already assembled, skip */ continue; rv |= Assemble(array_list->st, array_list->devname, mdfd, - array_list, configfile, + array_list, NULL, NULL, readonly, runstop, NULL, NULL, verbose, force); } |