Skip to content
Snippets Groups Projects
Commit 6e991d0e authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Allow to specify wipe command and flags at configure time


Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent edb8b377
No related branches found
No related tags found
No related merge requests found
...@@ -578,6 +578,7 @@ lib/_autoconf.py: Makefile stamp-directories vcs-version ...@@ -578,6 +578,7 @@ lib/_autoconf.py: Makefile stamp-directories vcs-version
echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
echo "NODED_USER = '$(NODED_USER)'"; \ echo "NODED_USER = '$(NODED_USER)'"; \
echo "VCS_VERSION = '$$VCSVER'"; \ echo "VCS_VERSION = '$$VCSVER'"; \
echo "WIPE_CMD = '$(WIPE_CMD)'"; \
} > $@ } > $@
$(REPLACE_VARS_SED): Makefile $(REPLACE_VARS_SED): Makefile
......
...@@ -176,6 +176,16 @@ AC_SUBST(CONFD_GROUP, $group_confd) ...@@ -176,6 +176,16 @@ AC_SUBST(CONFD_GROUP, $group_confd)
AC_SUBST(MASTERD_GROUP, $group_masterd) AC_SUBST(MASTERD_GROUP, $group_masterd)
AC_SUBST(DAEMONS_GROUP, $group_daemons) AC_SUBST(DAEMONS_GROUP, $group_daemons)
# --with-wipe-cmd=...
AC_ARG_WITH([wipe-cmd],
[AS_HELP_STRING([--with-wipe-cmd=COMMAND],
[wipe command including all options. Path will be appended to this value]
[ (default is dd if=/dev/zero bs=1024k oflag=direct of=)]
)],
[wipe_cmd="${withval}"],
[wipe_cmd="dd if=/dev/zero bs=1024k oflag=direct of="])
AC_SUBST(WIPE_CMD, $wipe_cmd)
# Print the config to the user # Print the config to the user
AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd]) AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd])
AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi]) AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi])
......
...@@ -95,6 +95,9 @@ CONFD_USER = _autoconf.CONFD_USER ...@@ -95,6 +95,9 @@ CONFD_USER = _autoconf.CONFD_USER
CONFD_GROUP = _autoconf.CONFD_GROUP CONFD_GROUP = _autoconf.CONFD_GROUP
NODED_USER = _autoconf.NODED_USER NODED_USER = _autoconf.NODED_USER
# Wipe
WIPE_CMD = _autoconf.WIPE_CMD
# file paths # file paths
DATA_DIR = _autoconf.LOCALSTATEDIR + "/lib/ganeti" DATA_DIR = _autoconf.LOCALSTATEDIR + "/lib/ganeti"
RUN_DIR = _autoconf.LOCALSTATEDIR + "/run" RUN_DIR = _autoconf.LOCALSTATEDIR + "/run"
......
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