From 3941cbcb97446a72c096da27171a3144a36fdfb7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 12 May 2023 14:46:59 +0200 Subject: Adding upstream version 4.2+20230508. Signed-off-by: Daniel Baumann --- mdadm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'mdadm.c') diff --git a/mdadm.c b/mdadm.c index 4685ad6..076b45e 100644 --- a/mdadm.c +++ b/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, "") == 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, "") == 0) + if (a->devname && is_devname_ignore(a->devname) == true) continue; r = Assemble(ss, a->devname, -- cgit v1.2.3