summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--daemons/lvmdbusd/cmdhandler.py4
-rwxr-xr-xtest/dbus/lvmdbustest.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/daemons/lvmdbusd/cmdhandler.py b/daemons/lvmdbusd/cmdhandler.py
index cf2a70875..cf9803e76 100644
--- a/daemons/lvmdbusd/cmdhandler.py
+++ b/daemons/lvmdbusd/cmdhandler.py
@@ -787,6 +787,10 @@ def activate_deactivate(op, name, activate, control_flags, options):
if (1 << 5) & control_flags:
cmd.append('--ignoreactivationskip')
+ # Shared locking (Cluster)
+ if (1 << 6) & control_flags:
+ op += 's'
+
if activate:
op += 'y'
else:
diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py
index 8f95757eb..475f328cb 100755
--- a/test/dbus/lvmdbustest.py
+++ b/test/dbus/lvmdbustest.py
@@ -1243,7 +1243,7 @@ class TestDbusService(unittest.TestCase):
self._check_consistency()
# Try control flags
- for i in range(0, 5):
+ for i in range(0, 6):
self.handle_return(lv_p.Lv.Activate(
dbus.UInt64(1 << i),