X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=ReadMe.c;h=3fae1930654bdca81d099466648c8e94d2aab890;hp=2a352ef31f9a949ed81f420e9a1dffc156b251de;hb=103f2410ec581620367d6fde67a3a62f077062a7;hpb=cbfbcb0b503752a560e607039924f3192fde314b diff --git a/ReadMe.c b/ReadMe.c index 2a352ef3..3fae1930 100644 --- a/ReadMe.c +++ b/ReadMe.c @@ -1,7 +1,7 @@ /* * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2001-2006 Neil Brown + * Copyright (C) 2001-2007 Neil Brown * * * This program is free software; you can redistribute it and/or modify @@ -19,17 +19,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: Neil Brown - * Email: - * Paper: Neil Brown - * School of Computer Science and Engineering - * The University of New South Wales - * Sydney, 2052 - * Australia + * Email: */ #include "mdadm.h" -char Version[] = Name " - v2.5.4 - 13 October 2006\n"; +char Version[] = Name " - v2.6.7 - 6th June 2008\n"; /* * File: ReadMe.c @@ -91,8 +86,11 @@ char Version[] = Name " - v2.5.4 - 13 October 2006\n"; * At the time if writing, there is only minimal support. */ -char short_options[]="-ABCDEFGQhVXvqbc:i:l:p:m:n:x:u:c:d:z:U:sarfRSow1tye:"; -char short_bitmap_auto_options[]="-ABCDEFGQhVXvqb:c:i:l:p:m:n:x:u:c:d:z:U:sa:rfRSow1tye:"; +char short_options[]="-ABCDEFGIQhVXWvqbc:i:l:p:m:n:x:u:c:d:z:U:sarfRSow1tye:"; +char short_bitmap_options[]= + "-ABCDEFGIQhVXWvqb:c:i:l:p:m:n:x:u:c:d:z:U:sarfRSow1tye:"; +char short_bitmap_auto_options[]= + "-ABCDEFGIQhVXWvqb:c:i:l:p:m:n:x:u:c:d:z:U:sa:rfRSow1tye:"; struct option long_options[] = { {"manage", 0, 0, '@'}, @@ -104,13 +102,15 @@ struct option long_options[] = { {"examine", 0, 0, 'E'}, {"follow", 0, 0, 'F'}, {"grow", 0, 0, 'G'}, + {"incremental",0,0, 'I'}, {"zero-superblock", 0, 0, 'K'}, /* deliberately no a short_option */ {"query", 0, 0, 'Q'}, {"examine-bitmap", 0, 0, 'X'}, + {"auto-detect", 0, 0, AutoDetect}, /* synonyms */ {"monitor", 0, 0, 'F'}, - + /* after those will normally come the name of the md device */ {"help", 0, 0, 'h'}, {"help-options",0,0,'h'}, @@ -160,9 +160,11 @@ struct option long_options[] = { {"readonly", 0, 0, 'o'}, {"readwrite", 0, 0, 'w'}, {"no-degraded",0,0, NoDegraded }, + {"wait", 0, 0, 'W'}, /* For Detail/Examine */ {"brief", 0, 0, 'b'}, + {"export", 0, 0, 'Y'}, {"sparc2.2", 0, 0, Sparc22}, {"test", 0, 0, 't'}, @@ -175,9 +177,12 @@ struct option long_options[] = { {"daemonize", 0, 0, 'f'}, {"oneshot", 0, 0, '1'}, {"pid-file", 1, 0, 'i'}, + {"syslog", 0, 0, 'y'}, /* For Grow */ {"backup-file", 1,0, BackupFile}, - + + /* For Incremental */ + {"rebuild-map", 0, 0, 'r'}, {0, 0, 0, 0} }; @@ -199,6 +204,10 @@ char Help[] = " make changes to an existing array.\n" " mdadm --misc options... devices\n" " report on or modify various md related devices.\n" +" mdadm --grow options device\n" +" resize/reshape an active array\n" +" mdadm --incremental device\n" +" add a device to an array as appropriate\n" " mdadm --monitor options...\n" " Monitor one or more array for significant changes.\n" " mdadm device options...\n" @@ -229,6 +238,8 @@ char OptionHelp[] = " --verbose -v : Be more verbose about what is happening\n" " --quiet -q : Don't print un-necessary messages\n" " --brief -b : Be less verbose, more brief\n" +" --export -Y : With --detail, use key=value format for easy\n" +" import into environment\n" " --force -f : Override normal checks and be more forceful\n" "\n" " --assemble -A : Assemble an array\n" @@ -238,8 +249,11 @@ char OptionHelp[] = " --examine -E : Examine superblock on an array component\n" " --examine-bitmap -X: Display the detail of a bitmap file\n" " --monitor -F : monitor (follow) some arrays\n" +" --grow -G : resize/ reshape and array\n" +" --incremental -I : add a single device to an array as appropriate\n" " --query -Q : Display general information about how a\n" " device relates to the md driver\n" +" --auto-detect : Start arrays auto-detected by the kernel\n" ; /* "\n" @@ -295,6 +309,7 @@ char OptionHelp[] = " --readonly -o : mark array as readonly\n" " --readwrite -w : mark array as readwrite\n" " --zero-superblock : erase the MD superblock from a device.\n" +" --wait -W : wait for recovery/resync/reshape to finish.\n" ; */ @@ -458,6 +473,7 @@ char Help_misc[] = " --readonly -o : mark array as readonly\n" " --readwrite -w : mark array as readwrite\n" " --test -t : exit status 0 if ok, 1 if degrade, 2 if dead, 4 if missing\n" +" --wait -W : wait for resync/rebuild/recovery to finish\n" ; char Help_monitor[] = @@ -490,19 +506,39 @@ char Help_grow[] = "\n" "This usage causes mdadm to attempt to reconfigure a running array.\n" "This is only possibly if the kernel being used supports a particular\n" -"reconfiguration. This version only supports changing the number of\n" -"devices in a RAID1, and changing the active size of all devices in\n" -"a RAID1/4/5/6.\n" +"reconfiguration. This version supports changing the number of\n" +"devices in a RAID1/5/6, changing the active size of all devices in\n" +"a RAID1/4/5/6, adding or removing a write-intent bitmap, and changing\n" +"the error mode for a 'FAULTY' array.\n" "\n" "Options that are valid with the grow (-G --grow) mode are:\n" +" --level= -l : Tell mdadm what level the array is so that it can\n" +" : interpret '--layout' properly.\n" +" --layout= -p : For a FAULTY array, set/change the error mode.\n" " --size= -z : Change the active size of devices in an array.\n" " : This is useful if all devices have been replaced\n" " : with larger devices.\n" -" --raid-disks= -n : Change the number of active devices in a RAID1\n" +" --raid-disks= -n : Change the number of active devices in an array.\n" " : array.\n" +" --bitmap= -b : Add or remove a write-intent bitmap.\n" ; - +char Help_incr[] = +"Usage: mdadm --incremental [-Rqrs] device\n" +"\n" +"This usage allows for incremental assembly of md arrays. Devices can be\n" +"added one at a time as they are discovered. Once an array has all expected\n" +"devices, it will be started.\n" +"\n" +"Options that are valid with incremental assembly (-I --incremental) more are:\n" +" --run -R : run arrays as soon as a minimal number of devices are\n" +" : present rather than waiting for all expected.\n" +" --quiet -q : Don't print any information messages, just errors.\n" +" --rebuild -r : Rebuild the 'map' file that mdadm uses for tracking\n" +" : partial arrays.\n" +" --scan -s : Use with -R to start any arrays that have the minimal\n" +" : required number of devices, but are not yet started.\n" +; char Help_config[] = "The /etc/mdadm.conf config file:\n\n" @@ -556,7 +592,7 @@ mapping_t r5layout[] = { }; mapping_t pers[] = { - { "linear", -1}, + { "linear", LEVEL_LINEAR}, { "raid0", 0}, { "0", 0}, { "stripe", 0}, @@ -567,13 +603,14 @@ mapping_t pers[] = { { "4", 4}, { "raid5", 5}, { "5", 5}, - { "multipath", -4}, - { "mp", -4}, + { "multipath", LEVEL_MULTIPATH}, + { "mp", LEVEL_MULTIPATH}, { "raid6", 6}, { "6", 6}, { "raid10", 10}, { "10", 10}, - { "faulty", -5}, + { "faulty", LEVEL_FAULTY}, + { "container", LEVEL_CONTAINER}, { NULL, 0} }; @@ -586,6 +623,8 @@ mapping_t modes[] = { { "misc", MISC}, { "monitor", MONITOR}, { "grow", GROW}, + { "incremental", INCREMENTAL}, + { "auto-detect", AUTODETECT}, }; mapping_t faultylayout[] = {