From 6e991d0e64e36adf985d0512e4148bcd6a160c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Thu, 21 Oct 2010 14:51:51 +0200
Subject: [PATCH] Allow to specify wipe command and flags at configure time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
Makefile.am | 1 +
configure.ac | 10 ++++++++++
lib/constants.py | 3 +++
3 files changed, 14 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 9b7b4a970..593635fab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -578,6 +578,7 @@ 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
diff --git a/configure.ac b/configure.ac
index 0cd517099..734f72251 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,16 @@ 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])
diff --git a/lib/constants.py b/lib/constants.py
index bb6aaf323..b66b6eb4d 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -95,6 +95,9 @@ CONFD_USER = _autoconf.CONFD_USER
CONFD_GROUP = _autoconf.CONFD_GROUP
NODED_USER = _autoconf.NODED_USER
+# Wipe
+WIPE_CMD = _autoconf.WIPE_CMD
+
# file paths
DATA_DIR = _autoconf.LOCALSTATEDIR + "/lib/ganeti"
RUN_DIR = _autoconf.LOCALSTATEDIR + "/run"
--
GitLab