Add --ignoremonitoring to disable all dmeventd interaction.

diff --git a/WHATS_NEW b/WHATS_NEW
index 3525c2d75122d072a83da0af3237ae82dddc3d38..baf64d336a3098d47288b2a87106fa3080408cff 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.27 - 
 ================================
+  Add --ignoremonitoring to disable all dmeventd interaction.
 
 Version 2.02.26 - 15th June 2007
 ================================

diff --git a/man/lvchange.8 b/man/lvchange.8
index 4f65f9a422d70f00e41fb1d2910e0240ff2571ba..ffc1068b07ec2e4889e7ea1857ff85ad6c0641b3 100644 (file)
--- a/man/lvchange.8
+++ b/man/lvchange.8
@@ -10,6 +10,7 @@ lvchange \- change attributes of a logical volume
 [\-\-resync]
 [\-h/\-?/\-\-help]
 [\-\-ignorelockingfailure]
+[\-\-ignoremonitoring]
 [\-\-monitor {y|n}]
 [\-M/\-\-persistent y/n] [\-\-minor minor]
 [\-P/\-\-partial]
@@ -60,6 +61,11 @@ the failure is handled according to
 \fBmirror_image_fault_policy\fP and \fBmirror_log_fault_policy\fP
 set in \fBlvm.conf\fP.
 .TP
+.I \-\-ignoremonitoring
+Make no attempt to interact with dmeventd unless \-\-monitor
+is specified.
+Do not use this if dmeventd is already monitoring a device.
+.TP
 .I \-M, \-\-persistent y/n
 Set to y to make the minor number specified persistent.
 .TP

diff --git a/man/vgchange.8 b/man/vgchange.8
index 86f0c6816dfd9bcfd4a99f29d9058243834bd190..4274c39d0902a89d4155c23f373657ae74f55796 100644 (file)
--- a/man/vgchange.8
+++ b/man/vgchange.8
@@ -16,6 +16,7 @@ vgchange \- change attributes of a volume group
 .IR Tag ]
 .RB [ \-h | \-\-help]
 .RB [ \-\-ignorelockingfailure]
+.RB [ \-\-ignoremonitoring]
 .RB [ \-l | \-\-logicalvolume
 .IR MaxLogicalVolumes ]
 .RB [ -p | \-\-maxphysicalvolumes
@@ -80,6 +81,12 @@ and
 set in 
 .BR lvm.conf (5).
 .TP
+.BR \-\-ignoremonitoring
+Make no attempt to interact with dmeventd unless 
+.BR \-\-monitor
+is specified.
+Do not use this if dmeventd is already monitoring a device.
+.TP
 .BR \-l ", " \-\-logicalvolume " " \fIMaxLogicalVolumes\fR
 Changes the maximum logical volume number of an existing inactive
 volume group.

diff --git a/tools/args.h b/tools/args.h
index e9e0d85017f29b4057269b6584c10c3dd2a6cc66..02701b15c41e8b7bba564cbb4fbaff6d85db0e21 100644 (file)
--- a/tools/args.h
+++ b/tools/args.h
@@ -51,6 +51,7 @@ arg(corelog_ARG, '\0', "corelog", NULL)
 arg(monitor_ARG, '\0', "monitor", yes_no_arg)
 arg(config_ARG, '\0', "config", string_arg)
 arg(trustcache_ARG, '\0', "trustcache", NULL)
+arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", NULL)
 
 /* Allow some variations */
 arg(resizable_ARG, '\0', "resizable", yes_no_arg)

diff --git a/tools/commands.h b/tools/commands.h
index c4a66f851a102141c8efab7a40dc50764f062dea..7c59e73949c792668efbb17c188a119d277b8232 100644 (file)
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -66,6 +66,7 @@ xx(lvchange,
    "\t[-f|--force]\n"
    "\t[-h|--help]\n"
    "\t[--ignorelockingfailure]\n"
+   "\t[--ignoremonitoring]\n"
    "\t[--monitor {y|n}]\n"
    "\t[-M|--persistent y|n] [--major major] [--minor minor]\n"
    "\t[-P|--partial] " "\n"
@@ -80,9 +81,9 @@ xx(lvchange,
    "\tLogicalVolume[Path] [LogicalVolume[Path]...]\n",
 
    alloc_ARG, autobackup_ARG, available_ARG, contiguous_ARG, force_ARG,
-   ignorelockingfailure_ARG, major_ARG, minor_ARG, monitor_ARG,
-   partial_ARG, permission_ARG, persistent_ARG, readahead_ARG, resync_ARG,
-   refresh_ARG, addtag_ARG, deltag_ARG, test_ARG, yes_ARG)
+   ignorelockingfailure_ARG, ignoremonitoring_ARG, major_ARG, minor_ARG,
+   monitor_ARG, partial_ARG, permission_ARG, persistent_ARG, readahead_ARG,
+   resync_ARG, refresh_ARG, addtag_ARG, deltag_ARG, test_ARG, yes_ARG)
 
 xx(lvconvert,
    "Change logical volume layout",
@@ -617,6 +618,7 @@ xx(vgchange,
    "\t[-d|--debug] " "\n"
    "\t[-h|--help] " "\n"
    "\t[--ignorelockingfailure]\n"
+   "\t[--ignoremonitoring]\n"
    "\t[--monitor {y|n}]\n"
    "\t[-t|--test]" "\n"
    "\t[-u|--uuid] " "\n"
@@ -633,9 +635,9 @@ xx(vgchange,
    "\t[VolumeGroupName...]\n",
 
    addtag_ARG, alloc_ARG, allocation_ARG, autobackup_ARG, available_ARG,
-   clustered_ARG, deltag_ARG, ignorelockingfailure_ARG, logicalvolume_ARG,
-   maxphysicalvolumes_ARG, monitor_ARG, partial_ARG, physicalextentsize_ARG,
-   resizeable_ARG, resizable_ARG, test_ARG, uuid_ARG)
+   clustered_ARG, deltag_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG,
+   logicalvolume_ARG, maxphysicalvolumes_ARG, monitor_ARG, partial_ARG,
+   physicalextentsize_ARG, resizeable_ARG, resizable_ARG, test_ARG, uuid_ARG)
 
 xx(vgck,
    "Check the consistency of volume group(s)",

diff --git a/tools/lvchange.c b/tools/lvchange.c
index 175200adc38275d7fe402c0a55a3ce36965945d6..b5927abbc7cd384e1124ba561c8ff474f57ac3ce 100644 (file)
--- a/tools/lvchange.c
+++ b/tools/lvchange.c
@@ -600,7 +600,7 @@ static int lvchange_single(struct cmd_context *cmd, struct logical_volume *lv,
        }
 
        init_dmeventd_monitor(arg_int_value(cmd, monitor_ARG,
-                                           cmd->is_static ?
+                                           (cmd->is_static || arg_count(cmd, ignoremonitoring_ARG)) ?
                                            DMEVENTD_MONITOR_IGNORE : DEFAULT_DMEVENTD_MONITOR));
 
        /* access permission change */

diff --git a/tools/vgchange.c b/tools/vgchange.c
index 0660409f779ffb3f6f5ff0d563e6ae7544d8ed6f..9be5af2a6aa6036aaaa736d04af813abedef2e1d 100644 (file)
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -536,7 +536,7 @@ static int vgchange_single(struct cmd_context *cmd, const char *vg_name,
        }
 
        init_dmeventd_monitor(arg_int_value(cmd, monitor_ARG,
-                                           cmd->is_static ?
+                                           (cmd->is_static || arg_count(cmd, ignoremonitoring_ARG)) ?
                                            DMEVENTD_MONITOR_IGNORE : DEFAULT_DMEVENTD_MONITOR));
 
        if (arg_count(cmd, available_ARG))