Skip to content
Snippets Groups Projects
Commit 68dccc07 authored by Guido Trotter's avatar Guido Trotter
Browse files

Make the default export path configurable.

This is needed to improve FHS compliance for distribution integration.
The need was discussed on the alioth pkg-ganeti project.

Reviewed-by: imsnah
parent 081b1e69
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,15 @@ AC_ARG_WITH([ssh-initscript], ...@@ -14,6 +14,15 @@ AC_ARG_WITH([ssh-initscript],
[ssh_initd_script="/etc/init.d/ssh"]) [ssh_initd_script="/etc/init.d/ssh"])
AC_SUBST(SSH_INITD_SCRIPT, $ssh_initd_script) AC_SUBST(SSH_INITD_SCRIPT, $ssh_initd_script)
# --with-export-dir=...
AC_ARG_WITH([export-dir],
[AS_HELP_STRING([--with-export-dir=DIR],
[directory to use by default for instance image exports (default is /srv/ganeti/export)]
)],
[export_dir="$withval"],
[export_dir="/srv/ganeti/export"])
AC_SUBST(EXPORT_DIR, $export_dir)
# Check common programs # Check common programs
AC_PROG_INSTALL AC_PROG_INSTALL
......
...@@ -16,4 +16,5 @@ _autoconf.py: Makefile ...@@ -16,4 +16,5 @@ _autoconf.py: Makefile
echo "LOCALSTATEDIR = '$(localstatedir)'"; \ echo "LOCALSTATEDIR = '$(localstatedir)'"; \
echo "SYSCONFDIR = '$(sysconfdir)'"; \ echo "SYSCONFDIR = '$(sysconfdir)'"; \
echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \ echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
} > $@ } > $@
...@@ -50,7 +50,7 @@ LOG_OS_DIR = LOG_DIR + "/os" ...@@ -50,7 +50,7 @@ LOG_OS_DIR = LOG_DIR + "/os"
LOG_NODESERVER = LOG_DIR + "/node-daemon.log" LOG_NODESERVER = LOG_DIR + "/node-daemon.log"
OS_DIR = "/srv/ganeti/os" OS_DIR = "/srv/ganeti/os"
EXPORT_DIR = "/srv/ganeti/export" EXPORT_DIR = _autoconf.EXPORT_DIR
EXPORT_CONF_FILE = "config.ini" EXPORT_CONF_FILE = "config.ini"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment