NeilBrown: Create: change default metadata type to 1.2

[Martin F. Krafft]

Module: mdadm
Branch: upstream
Commit: ad90adb689e3581432d71d995c9a8f0f6d31beb7
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=ad90adb689e3581432d71d995c9a8f0f6d31beb7

Author: NeilBrown <neilb at suse.de>
Date:   Wed Feb 24 12:03:27 2010 +1100

Create: change default metadata type to 1.2

Change default - again, sorry.

v1.1 causes problems as the conflicts with a boot sector, whether on
the whole device or in a partition.  I guess the rule is they you
aren't allowed to use the first sector in general.

v1.2 is mostly just as good and avoid boot-sector problems so default
to that instead.

Signed-off-by: NeilBrown <neilb at suse.de>

---

 mdadm.8  |    4 ++--
 super1.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mdadm.8 b/mdadm.8
index 882c3a2..d6b681a 100644
--- a/mdadm.8
+++ b/mdadm.8
@@ -299,7 +299,7 @@ says to get a list of array devices from
 .TP
 .BR \-e ", " \-\-metadata=
 Declare the style of RAID metadata (superblock) to be used.  The
-default is 1.1 for
+default is 1.2 for
 .BR \-\-create ,
 and to guess for other operations.
 The default can be overridden by setting the
@@ -320,7 +320,7 @@ Use the new version-1 format superblock.  This has few restrictions.
 The different sub-versions store the superblock at different locations
 on the device, either at the end (for 1.0), at the start (for 1.1) or
 4K from the start (for 1.2).  '1' is equivalent to '1.0', 'default' is
-equivalent to '1.1'.
+equivalent to '1.2'.
 .IP ddf
 Use the "Industry Standard" DDF (Disk Data Format) format defined by
 SNIA.
diff --git a/super1.c b/super1.c
index 7861cf4..73f4149 100644
--- a/super1.c
+++ b/super1.c
@@ -1357,13 +1357,13 @@ static struct supertype *match_metadata_desc1(char *arg)
 	}
 	if (strcmp(arg, "1.1") == 0 ||
 	    strcmp(arg, "1.01") == 0 ||
-	    strcmp(arg, "default") == 0 ||
 	    strcmp(arg, "") == 0 /* no metadata */
 		) {
 		st->minor_version = 1;
 		return st;
 	}
 	if (strcmp(arg, "1.2") == 0 ||
+	    strcmp(arg, "default") == 0 ||
 	    strcmp(arg, "1.02") == 0) {
 		st->minor_version = 2;
 		return st;