Documentation fix for importing with --src-dir option

Signed-off-by: Agata Murawska <agatamurawska@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 1e0ac3e..9251575 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -8252,8 +8252,8 @@ class LUInstanceCreate(LogicalUnit):
         self.needed_locks[locking.LEVEL_NODE] = locking.ALL_SET
         self.op.src_node = None
         if os.path.isabs(src_path):
         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)
                                      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 74bf915..41889fd 100644 (file)
--- 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 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
 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