Commit 4412f2ae authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Revert "Allow to specify wipe command and flags at configure time"

This reverts commit 6e991d0e

.

Conflicts:

	lib/constants.py (this got already removed, so no changes in here)
Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent b30aded7
......@@ -578,7 +578,6 @@ lib/_autoconf.py: Makefile stamp-directories vcs-version
echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
echo "NODED_USER = '$(NODED_USER)'"; \
echo "VCS_VERSION = '$$VCSVER'"; \
echo "WIPE_CMD = '$(WIPE_CMD)'"; \
} > $@
$(REPLACE_VARS_SED): Makefile
......
......@@ -176,16 +176,6 @@ AC_SUBST(CONFD_GROUP, $group_confd)
AC_SUBST(MASTERD_GROUP, $group_masterd)
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
AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd])
AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment