summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-06-08 01:20:28 +0000
committerNeil Brown <neilb@suse.de>2005-06-08 01:20:28 +0000
commit5585d4ea97dc13b7b79cc69cea9050f4958da03d (patch)
treeb5755bea8e8ba6b0bacd4c3d0eafa9f536902719
parentc50a674f709edb57f7fd17102f7f63475d7b12e9 (diff)
downloadmdadm-5585d4ea97dc13b7b79cc69cea9050f4958da03d.tar.gz
mdadm-5585d4ea97dc13b7b79cc69cea9050f4958da03d.tar.xz
mdadm-5585d4ea97dc13b7b79cc69cea9050f4958da03d.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 e618e72..040e925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ Changes Prior to 1.12.0 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 2b7c0d8..15dac7d 100644
--- a/util.c
+++ b/util.c
@@ -414,7 +414,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)