more pre-release fixes

diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index cffb7456588e175feb7152b1a8b4b478007d47e4..02994ef2fe808b1cb0524343b167952df5668b21 100644 (file)
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -468,7 +468,7 @@ int main(int argc, char *argv[])
 
        /* Set up signal handlers, USR1 is for cluster change notifications (in cman)
           USR2 causes child threads to exit.
-          HUP causes to re-read nodes list from CCS.
+          (HUP used to cause gulm to re-read the nodes list from CCS.)
           PIPE should be ignored */
        signal(SIGUSR2, sigusr2_handler);
        signal(SIGHUP,  sighup_handler);

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 5788060c1c8bb580b29fe7db2dee10e712403dd8..94c632f406f313c87bec199488f68506300d26b0 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -413,6 +413,26 @@ global {
     # performed (except for the unchanged vg_seqno).
     # Inappropriate use could mess up your system, so seek advice first!
     metadata_read_only = 0
+
+    # 'mirror_segtype_default' defines which segtype will be used when the
+    # shorthand '-m' option is used for mirroring.  The possible options are:
+    #
+    # "mirror" - The original RAID1 implementation provided by LVM2/DM.  It is
+    #           characterized by a flexible log solution (core, disk, mirrored)
+    #           and by the necessity to block I/O while reconfiguring in the
+    #           event of a failure.  Snapshots of this type of RAID1 can be
+    #           problematic.
+    #
+    # "raid1"  - This implementation leverages MD's RAID1 personality through
+    #           device-mapper.  It is characterized by a lack of log options.
+    #           (A log is always allocated for every device and they are placed
+    #           on the same device as the image - no separate devices are
+    #           required.)  This mirror implementation does not require I/O
+    #           to be blocked in the kernel in the event of a failure.
+    #
+    # Specify the '--type <mirror|raid1>' option to override this default
+    # setting.
+    mirror_segtype_default = "mirror"
 }
 
 activation {
@@ -479,26 +499,6 @@ activation {
     # "auto" - Use default value chosen by kernel.
     readahead = "auto"
 
-    # 'mirror_segtype_default' defines which segtype will be used when the
-    # shorthand '-m' option is used for mirroring.  The possible options are:
-    #
-    # "mirror" - The original RAID1 implementation provided by LVM2/DM.  It is
-    #           characterized by a flexible log solution (core, disk, mirrored)
-    #           and by the necessity to block I/O while reconfiguring in the
-    #           event of a failure.  Snapshots of this type of RAID1 can be
-    #           problematic.
-    #
-    # "raid1"  - This implementation leverages MD's RAID1 personality through
-    #           device-mapper.  It is characterized by a lack of log options.
-    #           (A log is always allocated for every device and they are placed
-    #           on the same device as the image - no separate devices are
-    #           required.)  This mirror implementation does not require I/O
-    #           to be blocked in the kernel in the event of a failure.
-    #
-    # Specify the '--type <mirror|raid1>' option to override this default
-    # setting.
-    mirror_segtype_default = "mirror"
-
     # 'mirror_image_fault_policy' and 'mirror_log_fault_policy' define
     # how a device failure affecting a mirror is handled.
     # A mirror is composed of mirror images (copies) and a log.

diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index de7805e391e57b70c96f4604bdc7e347593c352a..b8571e2432e77e182a93291b839f5459f80ee6e5 100644 (file)
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -384,7 +384,7 @@ static int _lvcreate_params(struct lvcreate_params *lp,
         */
        segtype_str = "striped";
        if (arg_count(cmd, mirrors_ARG))
-               segtype_str = find_config_tree_str(cmd, "activation/mirror_segtype_default", DEFAULT_MIRROR_SEGTYPE);
+               segtype_str = find_config_tree_str(cmd, "global/mirror_segtype_default", DEFAULT_MIRROR_SEGTYPE);
 
        lp->segtype = get_segtype_from_string(cmd, arg_str_value(cmd, type_ARG, segtype_str));