1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00

lvmdbusd: Remove addl. checks on --nojson

We check earlier that if you specify --nojson we will exit.
This commit is contained in:
Tony Asleson 2022-08-08 16:08:23 -05:00
parent 4b4d431631
commit 3eb19c4b7a

View File

@ -132,20 +132,12 @@ def main():
# cmdhandler is for when we are running other code with a different main. # cmdhandler is for when we are running other code with a different main.
cfg.blackbox = LvmFlightRecorder(cfg.args.bb_size) cfg.blackbox = LvmFlightRecorder(cfg.args.bb_size)
if cfg.args.use_lvm_shell and not cfg.args.use_json:
log_error("You cannot specify --lvmshell and --nojson")
sys.exit(1)
log_debug("Using lvm binary: %s" % cfg.LVM_CMD) log_debug("Using lvm binary: %s" % cfg.LVM_CMD)
# We will dynamically add interfaces which support vdo if it # We will dynamically add interfaces which support vdo if it
# exists. # exists.
cfg.vdo_support = supports_vdo() cfg.vdo_support = supports_vdo()
if cfg.vdo_support and not cfg.args.use_json:
log_error("You cannot specify --nojson when lvm has VDO support")
sys.exit(1)
# List of threads that we start up # List of threads that we start up
thread_list = [] thread_list = []