imsm: set generation number when reading superblock

[thirdparty/mdadm.git] / mdadm.conf-example

diff --git a/mdadm.conf-example b/mdadm.conf-example
index 65c97b707073574219a9993b1b5320a4c093d55a..35a75d128a6948ac74485d39e63cc2beaacb6c58 100644 (file)
--- a/mdadm.conf-example
+++ b/mdadm.conf-example
@@ -15,9 +15,9 @@
 #      ARRAY lines specify information about how to identify arrays so
 #        so that they can be activated
 #
-# You can have more than one device line and use wild cards. The first 
+# You can have more than one device line and use wild cards. The first
 # example includes SCSI the first partition of SCSI disks /dev/sdb,
-# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second 
+# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second
 # line looks for array slices on IDE disks.
 #
 #DEVICE /dev/sd[bcdjkl]1
@@ -27,20 +27,28 @@
 #DEVICE /dev/discs/*/*
 #
 #
+# The AUTO line can control which arrays get assembled by auto-assembly,
+# meaing either "mdadm -As" when there are no 'ARRAY' lines in this file,
+# or "mdadm --incremental" when the array found is not listed in this file.
+# By default, all arrays that are found are assembled.
+# If you want to ignore all DDF arrays (maybe they are managed by dmraid),
+# and only assemble 1.x arrays if which are marked for 'this' homehost,
+# but assemble all others, then use
+#AUTO -ddf homehost -1.x +all
 #
 # ARRAY lines specify an array to assemble and a method of identification.
 # Arrays can currently be identified by using a UUID, superblock minor number,
 # or a listing of devices.
 #
-#      super-minor is usally the minor number of the metadevice
+#      super-minor is usually the minor number of the metadevice
 #      UUID is the Universally Unique Identifier for the array
 # Each can be obtained using
 #
 #      mdadm -D <md>
 #
 #ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371
-#ARRAY /dev/md1 superminor=1
-#ARRAY /dev/md2 devices=/dev/hda1,/dev/hda2
+#ARRAY /dev/md1 super-minor=1
+#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1
 #
 # ARRAY lines can also specify a "spare-group" for each array.  mdadm --monitor
 # will then move a spare between arrays in a spare-group if one array has a failed
@@ -51,7 +59,7 @@
 # When used in --follow (aka --monitor) mode, mdadm needs a
 # mail address and/or a program.  This can be given with "mailaddr"
 # and "program" lines to that monitoring can be started using
-#    mdadm --follow --scan & echo $! > /var/run/mdadm
+#    mdadm --follow --scan & echo $! > /run/mdadm/mon.pid
 # If the lines are not found, mdadm will exit quietly
 #MAILADDR root@mydomain.tld
 #PROGRAM /usr/sbin/handle-mdadm-events