summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-06-14 06:33:24 +0000
committerNeil Brown <neilb@suse.de>2005-06-14 06:33:24 +0000
commit5a6d1148cccc50532ae6a96e04226522b7996850 (patch)
tree0f6ebdee421bc8e343cac15068f328849705ef45
parenta46f4061d3b35e101651a764582186e5f89b2bea (diff)
downloadmdadm-5a6d1148cccc50532ae6a96e04226522b7996850.tar.gz
mdadm-5a6d1148cccc50532ae6a96e04226522b7996850.tar.xz
mdadm-5a6d1148cccc50532ae6a96e04226522b7996850.zip
Fix parsing of /dev/md/N in is_standard
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
-rw-r--r--ChangeLog1
-rw-r--r--util.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e55e62..d045ec0 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 c349df8..8febfd2 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)