1 Star 0 Fork 27

Lv Ying/cloud-init

forked from src-openEuler/cloud-init 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
add-variable-to-forbid-tmp-dir.patch 1.90 KB
一键复制 编辑 原始数据 按行查看 历史
桐小哥 提交于 2024-01-24 19:42 . upgrade version to 23.4.1
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>
---
setup.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
index c3659cc..b4847ac 100644
--- a/setup.py
+++ b/setup.py
@@ -49,6 +49,8 @@ RENDERED_TMPD_PREFIX = "RENDERED_TEMPD"
VARIANT = None
PREFIX = None
+# add variable to forbid tmp dir
+num = 0
def render_tmpl(template, mode=None, is_yaml=False):
"""render template into a tmpdir under same dir as setup.py
@@ -69,7 +71,10 @@ def render_tmpl(template, mode=None, is_yaml=False):
return template
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)
bname = os.path.basename(template)
ename, ext = os.path.splitext(bname)
@@ -99,6 +104,10 @@ def render_tmpl(template, mode=None, is_yaml=False):
return os.path.join(os.path.basename(tmpd), bname)
+def sort_files(file_list):
+ file_list.sort()
+ return file_list
+
# User can set the variant for template rendering
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))
],
"systemd.generators": lambda: [
--
2.27.0
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/lvying6/cloud-init.git
git@gitee.com:lvying6/cloud-init.git
lvying6
cloud-init
cloud-init
master

搜索帮助