diff options
| author | Neil Brown <neilb@suse.de> | 2004-11-01 05:49:34 +0100 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2004-11-01 05:49:34 +0100 |
| commit | b5e64645037e99b5f05c9499b27b422ae60d23a9 (patch) | |
| tree | f0999c8649d1488a367ee3d9442aff538ae366a8 /mdassemble.c | |
| parent | mdadm-1.7.0 (diff) | |
| download | mdadm-b5e64645037e99b5f05c9499b27b422ae60d23a9.tar.xz mdadm-b5e64645037e99b5f05c9499b27b422ae60d23a9.zip | |
mdadm-1.8.0mdadm-1.8.0
Diffstat (limited to 'mdassemble.c')
| -rw-r--r-- | mdassemble.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mdassemble.c b/mdassemble.c index 55055dd1..43aed3c8 100644 --- a/mdassemble.c +++ b/mdassemble.c @@ -46,11 +46,16 @@ mapping_t pers[] = { { "5", 5}, { "multipath", -4}, { "mp", -4}, + { "raid6", 6}, + { "6", 6}, + { "raid10", 10}, + { "10", 10}, { NULL, 0} }; +#ifndef MDASSEMBLE_AUTO /* from mdadm.c */ -int open_mddev(char *dev) +int open_mddev(char *dev, int autof/*unused */) { int mdfd = open(dev, O_RDWR, 0); if (mdfd < 0) @@ -64,6 +69,7 @@ int open_mddev(char *dev) } return mdfd; } +#endif char *configfile = NULL; int rv; @@ -81,7 +87,7 @@ int main() { } else for (; array_list; array_list = array_list->next) { mdu_array_info_t array; - mdfd = open_mddev(array_list->devname); + mdfd = open_mddev(array_list->devname, array_list->autof); if (mdfd < 0) { rv |= 1; continue; |