From d12e7f458b55fdebe6899a6b4716f0d17b59b0b3 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 29 Apr 2021 17:47:49 +0200 Subject: [PATCH] rbd: --source-spec-file should be --source-spec-path It was renamed during development, get rid of the leftovers. Signed-off-by: Ilya Dryomov --- doc/rbd/rbd-live-migration.rst | 2 +- src/tools/rbd/action/Migration.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/rbd/rbd-live-migration.rst b/doc/rbd/rbd-live-migration.rst index fef951fb3b780..c3e09193d3114 100644 --- a/doc/rbd/rbd-live-migration.rst +++ b/doc/rbd/rbd-live-migration.rst @@ -116,7 +116,7 @@ The import-only live-migration process is initiated by running the same and providing a JSON-encoded ``source-spec`` to describe how to access the source image data. This ``source-spec`` can either be passed directly via the `--source-spec` optional, or via a file or STDIN via the -`--source-spec-file` optional:: +`--source-spec-path` optional:: $ rbd migration prepare --import-only --source-spec "" migration_target diff --git a/src/tools/rbd/action/Migration.cc b/src/tools/rbd/action/Migration.cc index e4e12276820d6..05b15f1869cca 100644 --- a/src/tools/rbd/action/Migration.cc +++ b/src/tools/rbd/action/Migration.cc @@ -177,8 +177,8 @@ int execute_prepare(const po::variables_map &vm, std::string source_spec; if (vm.count("source-spec") && vm.count("source-spec-path")) { - std::cerr << "rbd: cannot specify both source-image-spec and " - << "source-spec/source-spec-file" << std::endl; + std::cerr << "rbd: cannot specify both source-spec and source-spec-path" + << std::endl; return -EINVAL; } else if (vm.count("source-spec-path")) { std::string source_spec_path = vm["source-spec-path"].as(); -- 2.39.5