cloud-init/add-variable-to-forbid-tmp-dir.patch

66 lines
1.9 KiB
Diff
Raw Normal View History

2020-07-31 15:06:51 +08:00
From 224da46b2331b582577b86c3eb707f67d57800fb Mon Sep 17 00:00:00 2001
From: chengquan <chengquan3@huawei.com>
Date: Thu, 8 Aug 2019 16:15:31 +0800
Subject: [PATCH] cloud-init: add variable to forbid tmp dir
reason: add variable to forbid temporary directory
Signed-off-by: chengquan <chengquan3@huawei.com>
---
2024-01-24 19:42:49 +08:00
setup.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
2020-07-31 15:06:51 +08:00
2020-11-04 10:20:14 +08:00
diff --git a/setup.py b/setup.py
2024-01-24 19:42:49 +08:00
index c3659cc..b4847ac 100644
2020-11-04 10:20:14 +08:00
--- a/setup.py
+++ b/setup.py
2024-01-24 19:42:49 +08:00
@@ -49,6 +49,8 @@ RENDERED_TMPD_PREFIX = "RENDERED_TEMPD"
VARIANT = None
PREFIX = None
2023-07-12 15:58:59 +08:00
2020-07-31 15:06:51 +08:00
+# add variable to forbid tmp dir
+num = 0
2023-07-12 15:58:59 +08:00
2024-01-24 19:42:49 +08:00
def render_tmpl(template, mode=None, is_yaml=False):
2020-07-31 15:06:51 +08:00
"""render template into a tmpdir under same dir as setup.py
2024-01-24 19:42:49 +08:00
@@ -69,7 +71,10 @@ def render_tmpl(template, mode=None, is_yaml=False):
2020-07-31 15:06:51 +08:00
return template
2023-07-12 15:58:59 +08:00
2020-07-31 15:06:51 +08:00
topdir = os.path.dirname(sys.argv[0])
- tmpd = tempfile.mkdtemp(dir=topdir, prefix=RENDERED_TMPD_PREFIX)
+ global num
+ os.mkdir(topdir + str(num))
+ tmpd = os.path.abspath(topdir + str(num))
+ num = num + 1
atexit.register(shutil.rmtree, tmpd)
2024-01-24 19:42:49 +08:00
bname = os.path.basename(template)
ename, ext = os.path.splitext(bname)
@@ -99,6 +104,10 @@ def render_tmpl(template, mode=None, is_yaml=False):
2020-07-31 15:06:51 +08:00
return os.path.join(os.path.basename(tmpd), bname)
2023-07-12 15:58:59 +08:00
2024-01-24 19:42:49 +08:00
2020-07-31 15:06:51 +08:00
+def sort_files(file_list):
+ file_list.sort()
+ return file_list
2024-01-24 19:42:49 +08:00
+
2020-07-31 15:06:51 +08:00
# User can set the variant for template rendering
2024-01-24 19:42:49 +08:00
for a in sys.argv:
if a.startswith("--distro"):
@@ -139,11 +148,11 @@ INITSYS_FILES = {
"systemd": lambda: [
render_tmpl(f)
for f in (
- glob("systemd/*.tmpl")
+ sort_files((glob('systemd/*.tmpl')
+ glob("systemd/*.service")
+ glob("systemd/*.socket")
+ glob("systemd/*.target")
- )
+ )))
if (is_f(f) and not is_generator(f))
],
2024-01-24 19:42:49 +08:00
"systemd.generators": lambda: [
2023-07-12 15:58:59 +08:00
--
2.27.0