From 82461fade9b8a1de8379cb22b86f22134df1cd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Tue, 23 Aug 2011 11:10:36 +0200
Subject: [PATCH] Documentation fix for importing with --src-dir option
Signed-off-by: Agata Murawska <agatamurawska@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
(cherry picked from commit b7d7876bd0e9844fab8be28bfa1fd5d563ec7412)
Conflicts:
lib/cmdlib.py (easily fixed)
---
lib/cmdlib.py | 4 ++--
man/gnt-backup.rst | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 1e754af06..a42d9ecc8 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -7228,8 +7228,8 @@ class LUInstanceCreate(LogicalUnit):
self.needed_locks[locking.LEVEL_NODE] = locking.ALL_SET
self.op.src_node = None
if os.path.isabs(src_path):
- raise errors.OpPrereqError("Importing an instance from an absolute"
- " path requires a source node option.",
+ raise errors.OpPrereqError("Importing an instance from a path"
+ " requires a source node option",
errors.ECODE_INVAL)
else:
self.op.src_node = src_node = _ExpandNodeName(self.cfg, src_node)
diff --git a/man/gnt-backup.rst b/man/gnt-backup.rst
index 106efd010..001632c2d 100644
--- a/man/gnt-backup.rst
+++ b/man/gnt-backup.rst
@@ -179,6 +179,9 @@ instance allocator documentation.
The optional second value of the ``--node`` is used for the drbd
template and specifies the remote node.
+The ``--src-dir`` option allows importing instances from a directory
+below ``@CUSTOM_EXPORT_DIR@``.
+
Since many of the parameters are by default read from the exported
instance information and used as such, the new instance will have
all parameters explicitly specified, the opposite of a newly added
--
GitLab