summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Asleson <tasleson@redhat.com>2022-08-17 12:08:16 -0500
committerTony Asleson <tasleson@redhat.com>2022-09-16 10:49:37 -0500
commitcfc87157a4fdec39c2b570bd35ce812cda3003f6 (patch)
tree3f48ef7e0a2fae30115b1eae3e427b354e302c42
parent068073e924246ebda66b6dff590455d648007007 (diff)
downloadlvm2-cfc87157a4fdec39c2b570bd35ce812cda3003f6.tar.gz
lvmdbusd: Make sure to set cfg.got_external_event
We were incorrectly only setting this if --udev wasn't present on the command line. In all cases when we see a manager.ExternalEvent we want to set this.
-rw-r--r--daemons/lvmdbusd/manager.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/daemons/lvmdbusd/manager.py b/daemons/lvmdbusd/manager.py
index e6b0718c4..45e7bb0b8 100644
--- a/daemons/lvmdbusd/manager.py
+++ b/daemons/lvmdbusd/manager.py
@@ -194,6 +194,7 @@ class Manager(AutomatedProperties):
def _external_event(command):
utils.log_debug("Processing _external_event= %s" % command,
'bg_black', 'fg_orange')
+ cfg.got_external_event = True
cfg.load()
@dbus.service.method(
@@ -204,11 +205,9 @@ class Manager(AutomatedProperties):
# If a user didn't explicitly specify udev, we will turn it off now.
if not cfg.args.use_udev:
if udevwatch.remove():
- utils.log_debug("ExternalEvent received, disabling "
+ utils.log_msg("ExternalEvent received, disabling "
"udev monitoring")
# We are dependent on external events now to stay current!
- cfg.got_external_event = True
-
r = RequestEntry(
-1, Manager._external_event, (command,), None, None, False)
cfg.worker_q.put(r)