1
0
Fork 0

Merging upstream version 4.2+20230508.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-14 06:05:31 +01:00
parent 8119c4e7dc
commit 8f10cd7248
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
27 changed files with 335 additions and 232 deletions

View file

@ -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,