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 /Assemble.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 'Assemble.c')
-rw-r--r-- | Assemble.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -51,7 +51,7 @@ static int name_matches(char *found, char *required, char *homehost) } int Assemble(struct supertype *st, char *mddev, int mdfd, - mddev_ident_t ident, char *conffile, + mddev_ident_t ident, mddev_dev_t devlist, char *backup_file, int readonly, int runstop, char *update, char *homehost, @@ -181,7 +181,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, return 1; } if (devlist == NULL) - devlist = conf_get_devs(conffile); + devlist = conf_get_devs(); else if (mdfd >= 0) inargv = 1; |