37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 373ce3be8c1fc0835746eca91a4a2f8176df7203 Mon Sep 17 00:00:00 2001
|
|
From: jianli-97 <lijian2@kylinos.cn>
|
|
Date: Mon, 16 Oct 2023 14:40:48 +0800
|
|
Subject: [PATCH] fix cannot detect package manager on NestOS
|
|
|
|
---
|
|
src/ph_rpm.ml | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/ph_rpm.ml b/src/ph_rpm.ml
|
|
index db7818a..9a65d0a 100644
|
|
--- a/src/ph_rpm.ml
|
|
+++ b/src/ph_rpm.ml
|
|
@@ -31,14 +31,17 @@ let stringset_of_list pkgs =
|
|
let fedora_detect () =
|
|
Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
|
|
(Config.yumdownloader <> "no" || Config.dnf <> "no") &&
|
|
- (List.mem (Os_release.get_id ()) [ "fedora"; "rhel"; "centos"; "openEuler"; "hce"; "euleros"; "KylinSecOS"; "kylinsecos" ] ||
|
|
+ (List.mem (Os_release.get_id ()) [ "fedora"; "rhel"; "centos"; "openEuler"; "hce"; "euleros"; "KylinSecOS"; "kylinsecos"; "nestos" ] ||
|
|
+
|
|
try
|
|
(stat "/etc/redhat-release").st_kind = S_REG ||
|
|
(stat "/etc/fedora-release").st_kind = S_REG ||
|
|
(stat "/etc/openEuler-release").st_kind = S_REG ||
|
|
(stat "/etc/euleros-release").st_kind = S_REG ||
|
|
(stat "/etc/hce-release").st_kind = S_REG ||
|
|
- (stat "/etc/kylinsec-release").st_kind = S_REG
|
|
+ (stat "/etc/kylinsec-release").st_kind = S_REG ||
|
|
+ (stat "/etc/openEuler-release-nestos-for-virt").st_kind = S_REG
|
|
+
|
|
with Unix_error _ -> false)
|
|
|
|
let opensuse_detect () =
|
|
--
|
|
2.33.0
|
|
|