From 4412f2aeb2e7e89ea944756c3d88245c74195ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Tue, 26 Oct 2010 15:08:03 +0200
Subject: [PATCH] Revert "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
This reverts commit 6e991d0e64e36adf985d0512e4148bcd6a160c6a.
Conflicts:
lib/constants.py (this got already removed, so no changes in here)
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
Makefile.am | 1 -
configure.ac | 10 ----------
2 files changed, 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 593635fab..9b7b4a970 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/configure.ac b/configure.ac
index 734f72251..0cd517099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
--
GitLab