platform-intel: canonicalize_file_name() is not portable

[thirdparty/mdadm.git] / mdadm.conf.5

diff --git a/mdadm.conf.5 b/mdadm.conf.5
index 65b00293723c7a5834f400456b4391293a7ebef4..8a21fcc4e14ce375604e703cc263267010f1ddd1 100644 (file)
--- a/mdadm.conf.5
+++ b/mdadm.conf.5
@@ -53,7 +53,7 @@ Also, there may be several device lines present in the file.
 
 Alternatively, a
 .B device
-line can contain either of both of the  words
+line can contain either or both of the  words
 .B containers
 and
 .BR partitions .
@@ -339,14 +339,15 @@ line gives a default value for the
 .B \-\-homehost=
 option to mdadm.  There should normally be only one other word on the line.
 It should either be a host name, or one of the special words
-.B <system>
+.BR <system>,
+.B <none>
 and
 .BR <ignore> .
 If
 .B <system>
 is given, then the
 .BR gethostname ( 2 )
-systemcall is used to get the host name.
+systemcall is used to get the host name.  This is the default.
 
 If
 .B <ignore>
@@ -362,6 +363,12 @@ more that one other word on the
 .B HOMEHOST
 line.
 
+If
+.B <none>
+is given, then the default of using
+.BR gethostname ( 2 )
+is over-ridden and no homehost name is assumed.
+
 When arrays are created, this host name will be stored in the
 metadata.  When arrays are assembled using auto-assembly, arrays which
 do not record the correct homehost name in their metadata will be
@@ -432,7 +439,7 @@ A device may belong to several domains. The domain of an array is a union
 of domains of all devices in that array.  A spare can be automatically
 moved from one array to another if the set of the destination array's
 .I domains
-contains all the
+ppcontains all the
 .I domains
 of the new disk or if both arrays have the same
 .IR spare-group .
@@ -456,6 +463,7 @@ any arbitrary string
 .B path=
 file glob matching anything from
 .B /dev/disk/by-path
+.TP
 .B type=
 either 
 .B disk
@@ -464,6 +472,8 @@ or
 .TP
 .B action=
 include, re-add, spare, spare-same-slot, or force-spare
+.B auto=
+yes, no, or homehost.
 
 .P
 The
@@ -480,9 +490,12 @@ is irrelevant to the end result.
 .B include
 allows adding a disk to an array if metadata on that disk matches that array
 .TP
-.B re-add
+.B re\-add
 will include the device in the array if it appears to be a current member
-or a member that was recently removed
+or a member that was recently removed and the array has a
+write-intent-bitmap to allow the
+.B re\-add
+functionality.
 .TP
 .B spare
 as above and additionally: if the device is bare it can
@@ -494,7 +507,7 @@ as above and additionally if given slot was used by an array that went
 degraded recently and the device plugged in has no metadata then it will
 be automatically added to that array (or it's container)
 .TP
-.B force-spare
+.B force\-spare
 as above and the disk will become a spare in remaining cases
 .RE
 
@@ -563,7 +576,7 @@ CREATE group=system mode=0640 auto=part\-8
 .br
 HOMEHOST <system>
 .br
-AUTO +1.x homehost -all
+AUTO +1.x homehost \-all
 
 .SH SEE ALSO
 .BR mdadm (8),