From: Neil Brown <neilb@suse.de>
Date: Tue, 14 Jun 2005 06:33:24 +0000 (+0000)
Subject: Fix parsing of /dev/md/N in is_standard
X-Git-Tag: mdadm-2.0-devel-2~13
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=5a6d1148cccc50532ae6a96e04226522b7996850;hp=a46f4061d3b35e101651a764582186e5f89b2bea

Fix parsing of /dev/md/N in is_standard

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
---

diff --git a/ChangeLog b/ChangeLog
index 6e55e62c..d045ec02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Changes Prior to this release
 	value when running "--assemble --scan".  Previously
 	--auto was ignored if --scan was given
     -   Fix a few type casts
+    -   Fix parsing of /dev/md/N in is_standard
 	
 Changes Prior to 1.11.0 release
     -   Fix embarassing bug which causes --add to always fail.
diff --git a/util.c b/util.c
index c349df8d..8febfd2c 100644
--- a/util.c
+++ b/util.c
@@ -284,7 +284,7 @@ int is_standard(char *dev, int *nump)
 	else if (strncmp(d, "/md", 3)==0)
 		d += 3, type=-1; /* /dev/mdN */
 	else if (d-dev > 3 && strncmp(d-2, "md/", 3)==0)
-		type = -1; /* /dev/md/N */
+		d += 1, type=-1; /* /dev/md/N */
 	else
 		return 0;
 	if (!*d)