1 Star 0 Fork 23

庞庆/anaconda_4

forked from src-anolis-os/anaconda 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0004-anaconda-anolis-try-os-release-first.patch 1.52 KB
一键复制 编辑 原始数据 按行查看 历史
From 1955dfbe28e1c8a73d53ac36574d6f7251707cce Mon Sep 17 00:00:00 2001
From: pangqing <pangqing@uniontech.com>
Date: Wed, 28 Jul 2021 18:54:39 +0800
Subject: [PATCH] anaconda anolis try os release first
---
pyanaconda/modules/storage/devicetree/root.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/modules/storage/devicetree/root.py b/pyanaconda/modules/storage/devicetree/root.py
index 1af402e..cc2cfdd 100644
--- a/pyanaconda/modules/storage/devicetree/root.py
+++ b/pyanaconda/modules/storage/devicetree/root.py
@@ -164,13 +164,18 @@ def get_release_string(chroot):
rel_arch = None
try:
- filename = "%s/etc/redhat-release" % sysroot
+ filename = "%s/etc/os-release" % sysroot
if os.access(filename, os.R_OK):
- (rel_name, rel_ver) = _release_from_redhat_release(filename)
- else:
- filename = "%s/etc/os-release" % sysroot
+ (rel_name, rel_ver) = release_from_os_release(filename)
+ else:
+ filename = "%s/etc/anolis-release" % sysroot
+
if os.access(filename, os.R_OK):
- (rel_name, rel_ver) = _release_from_os_release(filename)
+ (rel_name, rel_ver) = _release_from_redhat_release(filename)
+ else:
+ filename = "%s/etc/redhat-release" % sysroot
+ if os.access(filename, os.R_OK):
+ (rel_name, rel_ver) = release_from_redhat_release(filename)
except ValueError:
pass
--
2.18.4
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/pang-qing/anaconda_4.git
git@gitee.com:pang-qing/anaconda_4.git
pang-qing
anaconda_4
anaconda_4
a8

搜索帮助

23e8dbc6 1850385 7e0993f3 1850385