2 files changed, 0 insertions, 52 deletions
diff --git a/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch b/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch
deleted file mode 100644
index 42841f905937..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tools/cfgupgrade b/tools/cfgupgrade
-index c8dfdec..0f886b2 100755
---- a/tools/cfgupgrade
-+++ b/tools/cfgupgrade
-@@ -169,6 +169,10 @@ def UpgradeCluster(config_data):
-     cluster.get("zeroing_image", "")
-   cluster["compression_tools"] = \
-     cluster.get("compression_tools", constants.IEC_DEFAULT_TOOLS)
-+  cluster["hv_state_static"] = \
-+    cluster.get("hv_state_static", {})
-+  cluster["disk_state_static"] = \
-+    cluster.get("disk_state_static", {})
-   if "enabled_user_shutdown" not in cluster:
-     cluster["enabled_user_shutdown"] = False
- 
diff --git a/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch b/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch
deleted file mode 100644
index 79bda3c989f3..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 6a47253..5d7c4cf 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -31,18 +31,24 @@ set -e
- 
- @SHELL_ENV_INIT@
- 
--readonly defaults_file="$SYSCONFDIR/default/ganeti"
-+readonly defaults_file="$SYSCONFDIR/conf.d/ganeti"
- 
- # This is a list of all daemons and the order in which they're started. The
- # order is important as there are dependencies between them. On shutdown,
- # they're stopped in reverse order.
--DAEMONS=(
--  ganeti-noded
--  ganeti-wconfd
--  ganeti-rapi
--  ganeti-luxid
--  ganeti-kvmd
--  )
-+DAEMONS=( ganeti-noded ) 
-+
-+_is_master() {
-+        [ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
-+        [ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
-+        [ "${ganeti_master}" = "${local_hostname}" ]
-+}
-+
-+if _is_master; then
-+  DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid )
-+fi
-+
-+DAEMONS+=( ganeti-kvmd )
- 
- # This is the list of daemons that are loaded on demand; they should only be
- # stopped, not started.