Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure name matching for array assembly understand the possibility of a homehost 

This "--assemble --name=foo" on host 'bar' will assemble an array named
'foo' or 'bar:foo'.

Signed-off-by: Neil Brown <neilb@suse.de>
This commit is contained in:
Neil Brown 2006-05-23 05:24:22 +00:00
parent 0237e0cafd
commit 624920bbb6
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Assemble.c
View File

@ -29,6 +29,26 @@
#include "mdadm.h"
static int name_matches(char *found, char *required, char *homehost)
{
/* See if the name found matches the required name, possibly
* prefixed with 'homehost'
*/
char fnd[33];
strncpy(fnd, found, 32);
fnd[32] = 0;
if (strcmp(found, required)==0)
return 1;
if (homehost) {
int l = strlen(homehost);
if (l < 32 && fnd[l] == ':' &&
strcmp(fnd+l+1, required)==0)
return 1;
}
return 0;
}
int Assemble(struct supertype *st, char *mddev, int mdfd,
mddev_ident_t ident, char *conffile,
mddev_dev_t devlist, char *backup_file,
@ -226,7 +246,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
continue;
}
if (ident->name[0] && (!update || strcmp(update, "name")!= 0) &&
(!super || strncmp(info.name, ident->name, 32)!=0)) {
(!super || name_matches(info.name, ident->name, homehost)==0)) {
if ((inargv && verbose >= 0) || verbose > 0)
fprintf(stderr, Name ": %s has wrong name.\n",
devname);

6
mdadm.8
View File

@ -595,7 +595,11 @@ will look for super blocks with a minor number of 0.
.TP
.BR -N ", " --name=
Specify the name of the array to assemble. This must be the name
that was specified when creating the array.
that was specified when creating the array. It must either match
then name stored in the superblock exactly, or it must match
which the current
.I homehost
is added to the start of the given name.
.TP
.BR -f ", " --force