Reshuffling the patches to match upstream submissions

3 files changed, 0 insertions, 25 deletions

diff --git a/func/patches/0004-Adding-a-find_resources-script-to-look-across-minion.patch b/func/patches/0003-Adding-a-find_resources-script-to-look-across-minion.patch
index 586c8c5..586c8c5 100644
--- a/func/patches/0004-Adding-a-find_resources-script-to-look-across-minion.patch
+++ b/func/patches/0003-Adding-a-find_resources-script-to-look-across-minion.patch
diff --git a/func/patches/0003-Closing-file-descriptors-during-the-virt-install-to.patch b/func/patches/0003-Closing-file-descriptors-during-the-virt-install-to.patch
deleted file mode 100644
index 28b631d..0000000
--- a/func/patches/0003-Closing-file-descriptors-during-the-virt-install-to.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d204ee82600d04cc4dc76afb81712210fa0c1dfe Mon Sep 17 00:00:00 2001
-From: Matthew Hicks <mhicks@mhicks-host.usersys.redhat.com>
-Date: Tue, 17 Jun 2008 22:35:14 -0400
-Subject: [PATCH] Closing file descriptors during the virt install to avoid leaking them
-
----
- func/minion/modules/virt.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/func/minion/modules/virt.py b/func/minion/modules/virt.py
-index 40ae274..c4b718a 100644
---- a/func/minion/modules/virt.py
-+++ b/func/minion/modules/virt.py
-@@ -236,7 +236,7 @@ class Virt(func_module.FuncModule):
-         if virt_path:
-             koan_args.append("--virt-path=%s" % virt_path)
- 
--        rc = sub_process.call(koan_args,shell=False)
-+        rc = sub_process.call(koan_args,shell=False,close_fds=True)
-         if rc == 0:
-             return 0
-         else:
--- 
-1.5.3.6
-
diff --git a/func/patches/0005-Closing-file-descriptors-during-the-virt-install-to.patch b/func/patches/0004-Closing-file-descriptors-during-the-virt-install-to.patch
index 83fbc4f..83fbc4f 100644
--- a/func/patches/0005-Closing-file-descriptors-during-the-virt-install-to.patch
+++ b/func/patches/0004-Closing-file-descriptors-during-the-virt-install-to.patch