From 56956bcb88b05f50e15b928d9e4fe7af6ee8576f Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Sat, 13 Nov 2010 21:46:57 +0100 Subject: [PATCH] Some further man tweaks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes one non-defined @CUSTOM_@ entry, and replaces two hardcoded paths with further configure-time variables. Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: RenΓ© Nussbaumer <rn@google.com> --- Makefile.am | 2 ++ man/gnt-backup.rst | 2 +- man/gnt-instance.rst | 13 ++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index e3e878192..9468fa85b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -656,6 +656,8 @@ $(REPLACE_VARS_SED): Makefile echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \ echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \ echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \ + echo 's#@CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \ + echo 's#@CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \ echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \ echo 's#@RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \ echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \ diff --git a/man/gnt-backup.rst b/man/gnt-backup.rst index a8bd39810..9c8900c07 100644 --- a/man/gnt-backup.rst +++ b/man/gnt-backup.rst @@ -29,7 +29,7 @@ EXPORT Exports an instance to the target node. All the instance data and its configuration will be exported under the -/srv/ganeti/export/*instance* directory on the target node. +``@CUSTOM_EXPORT_DIR@/``*instance* directory on the target node. The ``--shutdown-timeout`` is used to specify how much time to wait before forcing the shutdown (xm destroy in xen, killing the kvm diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst index a92104cf6..bc1281122 100644 --- a/man/gnt-instance.rst +++ b/man/gnt-instance.rst @@ -435,14 +435,13 @@ If you do not want gnt-instance to wait for the disk mirror to be synced, use the ``--no-wait-for-sync`` option. The ``--file-storage-dir`` specifies the relative path under the -cluster-wide file storage directory to store file-based disks. It -is useful for having different subdirectories for different +cluster-wide file storage directory to store file-based disks. It is +useful for having different subdirectories for different instances. The full path of the directory where the disk files are -stored will consist of cluster-wide file storage directory + -optional subdirectory + instance name. Example: -/srv/ganeti/file-storage/mysubdir/instance1.example.com. This -option is only relevant for instances using the file storage -backend. +stored will consist of cluster-wide file storage directory + optional +subdirectory + instance name. Example: +``@RPL_FILE_STORAGE_DIR@``*/mysubdir/instance1.example.com*. This +option is only relevant for instances using the file storage backend. The ``--file-driver`` specifies the driver to use for file-based disks. Note that currently these drivers work with the xen -- GitLab