Merging upstream version 4.2+20230508.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
8119c4e7dc
commit
8f10cd7248
27 changed files with 335 additions and 232 deletions
9
mdadm.c
9
mdadm.c
|
@ -107,8 +107,8 @@ int main(int argc, char *argv[])
|
|||
|
||||
srandom(time(0) ^ getpid());
|
||||
|
||||
if (get_linux_version() < 2006015) {
|
||||
pr_err("This version of mdadm does not support kernels older than 2.6.15\n");
|
||||
if (get_linux_version() < 2006032) {
|
||||
pr_err("This version of mdadm does not support kernels older than 2.6.32\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
@ -154,7 +154,7 @@ int main(int argc, char *argv[])
|
|||
continue;
|
||||
|
||||
case HomeHost:
|
||||
if (strcasecmp(optarg, "<ignore>") == 0)
|
||||
if (is_devname_ignore(optarg) == true)
|
||||
c.require_homehost = 0;
|
||||
else
|
||||
c.homehost = optarg;
|
||||
|
@ -1749,8 +1749,7 @@ static int scan_assemble(struct supertype *ss,
|
|||
int r;
|
||||
if (a->assembled)
|
||||
continue;
|
||||
if (a->devname &&
|
||||
strcasecmp(a->devname, "<ignore>") == 0)
|
||||
if (a->devname && is_devname_ignore(a->devname) == true)
|
||||
continue;
|
||||
|
||||
r = Assemble(ss, a->devname,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue