Blob Blame History Raw
From ab80c515bfd527e1609d4e5ffd7c6b18d5a202dc Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek@redhat.com>
Date: Wed, 13 Oct 2021 18:30:23 +0200
Subject: [PATCH] daemon: inspection: Add support for Kylin (RHBZ#1995391).

Similar-to: cd08039d2427b584237265237c713d8cf46536a0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20211013163023.21786-1-lersek@redhat.com>
Acked-by: Richard W.M. Jones <rjones@redhat.com>
(cherry picked from commit 305b02e7e74afc3777b2291783cd7634fb76ecaf)
---
 daemon/inspect_fs.ml            | 2 ++
 daemon/inspect_fs_unix.ml       | 1 +
 daemon/inspect_types.ml         | 2 ++
 daemon/inspect_types.mli        | 1 +
 generator/actions_inspection.ml | 4 ++++
 5 files changed, 10 insertions(+)

diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml
index 02b5a0470..77f0f6aea 100644
--- a/daemon/inspect_fs.ml
+++ b/daemon/inspect_fs.ml
@@ -275,6 +275,7 @@ and check_package_format { distro } =
      Some PACKAGE_FORMAT_RPM
   | Some DISTRO_DEBIAN
   | Some DISTRO_KALI_LINUX
+  | Some DISTRO_KYLIN (* supposedly another Ubuntu derivative *)
   | Some DISTRO_LINUX_MINT
   | Some DISTRO_UBUNTU ->
      Some PACKAGE_FORMAT_DEB
@@ -345,6 +346,7 @@ and check_package_management { distro; version } =
   | Some DISTRO_ALTLINUX
   | Some DISTRO_DEBIAN
   | Some DISTRO_KALI_LINUX
+  | Some DISTRO_KYLIN (* supposedly another Ubuntu derivative *)
   | Some DISTRO_LINUX_MINT
   | Some DISTRO_UBUNTU ->
      Some PACKAGE_MANAGEMENT_APT
diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml
index 652bacc0f..7f6eb92e9 100644
--- a/daemon/inspect_fs_unix.ml
+++ b/daemon/inspect_fs_unix.ml
@@ -146,6 +146,7 @@ and distro_of_os_release_id = function
   | "frugalware" -> Some DISTRO_FRUGALWARE
   | "gentoo" -> Some DISTRO_GENTOO
   | "kali" -> Some DISTRO_KALI_LINUX
+  | "kylin" -> Some DISTRO_KYLIN
   | "mageia" -> Some DISTRO_MAGEIA
   | "neokylin" -> Some DISTRO_NEOKYLIN
   | "openmandriva" -> Some DISTRO_OPENMANDRIVA
diff --git a/daemon/inspect_types.ml b/daemon/inspect_types.ml
index 18e410ce0..e2bc7165c 100644
--- a/daemon/inspect_types.ml
+++ b/daemon/inspect_types.ml
@@ -79,6 +79,7 @@ and distro =
   | DISTRO_FRUGALWARE
   | DISTRO_GENTOO
   | DISTRO_KALI_LINUX
+  | DISTRO_KYLIN
   | DISTRO_LINUX_MINT
   | DISTRO_MAGEIA
   | DISTRO_MANDRIVA
@@ -211,6 +212,7 @@ and string_of_distro = function
   | DISTRO_FRUGALWARE -> "frugalware"
   | DISTRO_GENTOO -> "gentoo"
   | DISTRO_KALI_LINUX -> "kalilinux"
+  | DISTRO_KYLIN -> "kylin"
   | DISTRO_LINUX_MINT -> "linuxmint"
   | DISTRO_MAGEIA -> "mageia"
   | DISTRO_MANDRIVA -> "mandriva"
diff --git a/daemon/inspect_types.mli b/daemon/inspect_types.mli
index d12f7a61a..43c79818f 100644
--- a/daemon/inspect_types.mli
+++ b/daemon/inspect_types.mli
@@ -86,6 +86,7 @@ and distro =
   | DISTRO_FRUGALWARE
   | DISTRO_GENTOO
   | DISTRO_KALI_LINUX
+  | DISTRO_KYLIN
   | DISTRO_LINUX_MINT
   | DISTRO_MAGEIA
   | DISTRO_MANDRIVA
diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml
index 690afd460..0c6d39b43 100644
--- a/generator/actions_inspection.ml
+++ b/generator/actions_inspection.ml
@@ -214,6 +214,10 @@ Gentoo.
 
 Kali Linux.
 
+=item \"kylin\"
+
+Kylin.
+
 =item \"linuxmint\"
 
 Linux Mint.
-- 
2.31.1