From: NeilBrown Date: Mon, 19 Oct 2009 06:11:15 +0000 (+1100) Subject: mdopen: only use 'dev' as chosen name if it is a full path. X-Git-Tag: mdadm-3.0.3~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ac6db12f9f970f26b7017517789bac200631b11;p=thirdparty%2Fmdadm.git mdopen: only use 'dev' as chosen name if it is a full path. Otherwise using names like "r0" causes problem. They are handled sufficiently by other paths in the code. Signed-off-by: NeilBrown --- diff --git a/mdopen.c b/mdopen.c index d322cf42..ed53d6f3 100644 --- a/mdopen.c +++ b/mdopen.c @@ -156,7 +156,6 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, if (dev) { - if (strncmp(dev, "/dev/md/", 8) == 0) { strcpy(cname, dev+8); } else if (strncmp(dev, "/dev/", 5) == 0) { @@ -307,7 +306,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, } } - if (dev) + if (dev && dev[0] == '/') strcpy(chosen, dev); else if (cname[0] == 0) strcpy(chosen, devname);