}
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,
return 1;
}
if (devlist == NULL)
- devlist = conf_get_devs(conffile);
+ devlist = conf_get_devs();
else if (mdfd >= 0)
inargv = 1;
code was ever in there)
- Work better when no 'ftw' is available, and check to see
if current uclibc provides ftw.
+ - Never use /etc/mdadm.conf if --config file is given (previously
+ some code used one, some used the other).
Changes Prior to 2.5.1 release
- Various fixes for gcc warnings
ldsize <<= 9;
}
if (st == NULL) {
- struct createinfo *ci = conf_get_create_info(NULL);
+ struct createinfo *ci = conf_get_create_info();
if (ci)
st = ci->supertype;
}
int Monitor(mddev_dev_t devlist,
char *mailaddr, char *alert_cmd,
int period, int daemonise, int scan, int oneshot,
- int dosyslog, char *config, int test, char* pidfile)
+ int dosyslog, int test, char* pidfile)
{
/*
* Every few seconds, scan every md device looking for changes
char *mailfrom = NULL;
if (!mailaddr) {
- mailaddr = conf_get_mailaddr(config);
+ mailaddr = conf_get_mailaddr();
if (mailaddr && ! scan)
fprintf(stderr, Name ": Monitor using email address \"%s\" from config file\n",
mailaddr);
}
- mailfrom = conf_get_mailfrom(config);
+ mailfrom = conf_get_mailfrom();
if (!alert_cmd) {
- alert_cmd = conf_get_program(config);
+ alert_cmd = conf_get_program();
if (alert_cmd && ! scan)
fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n",
alert_cmd);
}
if (devlist == NULL) {
- mddev_ident_t mdlist = conf_get_ident(config, NULL);
+ mddev_ident_t mdlist = conf_get_ident(NULL);
for (; mdlist; mdlist=mdlist->next) {
struct state *st = malloc(sizeof *st);
if (st == NULL)
} else {
mddev_dev_t dv;
for (dv=devlist ; dv; dv=dv->next) {
- mddev_ident_t mdlist = conf_get_ident(config, dv->devname);
+ mddev_ident_t mdlist = conf_get_ident(dv->devname);
struct state *st = malloc(sizeof *st);
if (st == NULL)
continue;
int loaded = 0;
-void load_conffile(char *conffile)
+static char *conffile = NULL;
+void set_conffile(char *file)
+{
+ conffile = file;
+}
+
+void load_conffile(void)
{
FILE *f;
char *line;
/* printf("got file\n"); */
}
-char *conf_get_mailaddr(char *conffile)
+char *conf_get_mailaddr(void)
{
- load_conffile(conffile);
+ load_conffile();
return alert_email;
}
-char *conf_get_mailfrom(char *conffile)
+char *conf_get_mailfrom(void)
{
- load_conffile(conffile);
+ load_conffile();
return alert_mail_from;
}
-char *conf_get_program(char *conffile)
+char *conf_get_program(void)
{
- load_conffile(conffile);
+ load_conffile();
return alert_program;
}
-char *conf_get_homehost(char *conffile)
+char *conf_get_homehost(void)
{
- load_conffile(conffile);
+ load_conffile();
return home_host;
}
-struct createinfo *conf_get_create_info(char *conffile)
+struct createinfo *conf_get_create_info(void)
{
- load_conffile(conffile);
+ load_conffile();
return &createinfo;
}
-mddev_ident_t conf_get_ident(char *conffile, char *dev)
+mddev_ident_t conf_get_ident(char *dev)
{
mddev_ident_t rv;
- load_conffile(conffile);
+ load_conffile();
rv = mddevlist;
while (dev && rv && strcmp(dev, rv->devname)!=0)
rv = rv->next;
return rv;
}
-mddev_dev_t conf_get_devs(char *conffile)
+mddev_dev_t conf_get_devs()
{
glob_t globbuf;
struct conf_dev *cd;
free(t);
}
- load_conffile(conffile);
+ load_conffile();
if (cdevlist == NULL)
/* default to 'partitions */
exit(2);
}
configfile = optarg;
+ set_conffile(configfile);
/* FIXME possibly check that config file exists. Even parse it */
continue;
case O(ASSEMBLE,'s'): /* scan */
}
if (homehost == NULL)
- homehost = conf_get_homehost(configfile);
+ homehost = conf_get_homehost();
if (homehost && strcmp(homehost, "<system>")==0) {
if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) {
sys_hostname[sizeof(sys_hostname)-1] = 0;
if (devs_found == 1 && ident.uuid_set == 0 &&
ident.super_minor == UnSet && ident.name[0] == 0 && !scan ) {
/* Only a device has been given, so get details from config file */
- mddev_ident_t array_ident = conf_get_ident(configfile, devlist->devname);
+ mddev_ident_t array_ident = conf_get_ident(devlist->devname);
if (array_ident == NULL) {
fprintf(stderr, Name ": %s not identified in config file.\n",
devlist->devname);
if (mdfd < 0)
rv |= 1;
else {
- rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile,
+ rv |= Assemble(ss, devlist->devname, mdfd, array_ident,
NULL, backup_file,
readonly, runstop, update, homehost, verbose-quiet, force);
close(mdfd);
}
}
} else if (!scan)
- rv = Assemble(ss, devlist->devname, mdfd, &ident, configfile,
+ rv = Assemble(ss, devlist->devname, mdfd, &ident,
devlist->next, backup_file,
readonly, runstop, update, homehost, verbose-quiet, force);
else if (devs_found>0) {
exit(1);
}
for (dv = devlist ; dv ; dv=dv->next) {
- mddev_ident_t array_ident = conf_get_ident(configfile, dv->devname);
+ mddev_ident_t array_ident = conf_get_ident(dv->devname);
if (array_ident == NULL) {
fprintf(stderr, Name ": %s not identified in config file.\n",
dv->devname);
rv |= 1;
continue;
}
- rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile,
+ rv |= Assemble(ss, dv->devname, mdfd, array_ident,
NULL, backup_file,
readonly, runstop, update, homehost, verbose-quiet, force);
close(mdfd);
}
} else {
- mddev_ident_t array_list = conf_get_ident(configfile, NULL);
- mddev_dev_t devlist = conf_get_devs(configfile);
+ mddev_ident_t array_list = conf_get_ident(NULL);
+ mddev_dev_t devlist = conf_get_devs();
int cnt = 0;
if (devlist == NULL) {
fprintf(stderr, Name ": No devices listed in conf file were found.\n");
;
else {
rv |= Assemble(ss, array_list->devname, mdfd,
- array_list, configfile,
+ array_list,
devlist, NULL,
readonly, runstop, NULL, homehost, verbose-quiet, force);
if (rv == 0) cnt++;
acnt = 0;
do {
rv2 = Assemble(ss, NULL, -1,
- &ident, configfile,
+ &ident,
devlist, NULL,
readonly, runstop, NULL, homehost, verbose-quiet, force);
if (rv2==0) {
auto_update_home = 0;
} while (rv2!=2);
/* Incase there are stacked devices, we need to go around again */
- devlist = conf_get_devs(configfile);
+ devlist = conf_get_devs();
} while (acnt);
if (cnt == 0 && auto_update_home && homehost) {
/* Nothing found, maybe we need to bootstrap homehost info */
acnt = 0;
do {
rv2 = Assemble(ss, NULL, -1,
- &ident, configfile,
+ &ident,
devlist, NULL,
readonly, runstop, "homehost", homehost, verbose-quiet, force);
if (rv2==0) {
}
} while (rv2!=2);
/* Incase there are stacked devices, we need to go around again */
- devlist = conf_get_devs(configfile);
+ devlist = conf_get_devs();
} while (acnt);
}
if (cnt == 0 && rv == 0) {
exit(2);
}
if (devlist == NULL)
- devlist = conf_get_devs(configfile);
+ devlist = conf_get_devs();
if (devlist == NULL) {
fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
exit(1);
}
rv= Monitor(devlist, mailaddr, program,
delay?delay:60, daemonise, scan, oneshot,
- dosyslog, configfile, test, pidfile);
+ dosyslog, test, pidfile);
break;
case GROW:
extern int Assemble(struct supertype *st, char *mddev, int mdfd,
mddev_ident_t ident,
- char *conffile,
mddev_dev_t devlist, char *backup_file,
int readonly, int runstop,
char *update, char *homehost,
extern int Monitor(mddev_dev_t devlist,
char *mailaddr, char *alert_cmd,
int period, int daemonise, int scan, int oneshot,
- int dosyslog, char *config, int test, char *pidfile);
+ int dosyslog, int test, char *pidfile);
extern int Kill(char *dev, int force, int quiet);
extern int is_standard(char *dev, int *nump);
extern int parse_auto(char *str, char *msg, int config);
-extern mddev_ident_t conf_get_ident(char *conffile, char *dev);
-extern mddev_dev_t conf_get_devs(char *conffile);
-extern struct createinfo *conf_get_create_info(char *conffile);
-extern char *conf_get_mailaddr(char *conffile);
-extern char *conf_get_mailfrom(char *conffile);
-extern char *conf_get_program(char *conffile);
-extern char *conf_get_homehost(char *conffile);
+extern mddev_ident_t conf_get_ident(char *dev);
+extern mddev_dev_t conf_get_devs(void);
+extern struct createinfo *conf_get_create_info(void);
+extern void set_conffile(char *file);
+extern char *conf_get_mailaddr(void);
+extern char *conf_get_mailfrom(void);
+extern char *conf_get_program(void);
+extern char *conf_get_homehost(void);
extern char *conf_line(FILE *file);
extern char *conf_word(FILE *file, int allow_key);
extern void free_line(char *line);
}
#endif
-char *configfile = NULL;
int rv;
int mdfd = -1;
int runstop = 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;
/* 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);
}
int must_remove = 0;
struct mdstat_ent *mdlist;
int num;
- struct createinfo *ci = conf_get_create_info(NULL);
+ struct createinfo *ci = conf_get_create_info();
int parts;
if (autof == 0)