[Libguestfs] [PATCH] inspect: recognize the Kali Linux distribution (RHBZ#1544227)

Read the information from os-release, and make it behave like a Debian distribution (i.e. using dpkg, and apt). --- 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 2db218bb2..383e3e0a7 100644 --- a/daemon/inspect_fs.ml +++ b/daemon/inspect_fs.ml @@ -275,6 +275,7 @@ and check_package_format { distro } = | Some DISTRO_SUSE_BASED -> Some PACKAGE_FORMAT_RPM | Some DISTRO_DEBIAN + | Some DISTRO_KALI_LINUX | Some DISTRO_LINUX_MINT | Some DISTRO_UBUNTU -> Some PACKAGE_FORMAT_DEB @@ -344,6 +345,7 @@ and check_package_management { distro; version } = | Some DISTRO_ALTLINUX | Some DISTRO_DEBIAN + | Some DISTRO_KALI_LINUX | 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 d0323af3f..53c86e878 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -140,6 +140,7 @@ and distro_of_os_release_id = function | "debian" -> Some DISTRO_DEBIAN | "fedora" -> Some DISTRO_FEDORA | "frugalware" -> Some DISTRO_FRUGALWARE + | "kali" -> Some DISTRO_KALI_LINUX | "mageia" -> Some DISTRO_MAGEIA | "neokylin" -> Some DISTRO_NEOKYLIN | "opensuse" -> Some DISTRO_OPENSUSE diff --git a/daemon/inspect_types.ml b/daemon/inspect_types.ml index 464b8c2a6..70b34c51c 100644 --- a/daemon/inspect_types.ml +++ b/daemon/inspect_types.ml @@ -78,6 +78,7 @@ and distro = | DISTRO_FREEDOS | DISTRO_FRUGALWARE | DISTRO_GENTOO + | DISTRO_KALI_LINUX | DISTRO_LINUX_MINT | DISTRO_MAGEIA | DISTRO_MANDRIVA @@ -208,6 +209,7 @@ and string_of_distro = function | DISTRO_FREEDOS -> "freedos" | DISTRO_FRUGALWARE -> "frugalware" | DISTRO_GENTOO -> "gentoo" + | DISTRO_KALI_LINUX -> "kalilinux" | DISTRO_LINUX_MINT -> "linuxmint" | DISTRO_MAGEIA -> "mageia" | DISTRO_MANDRIVA -> "mandriva" diff --git a/daemon/inspect_types.mli b/daemon/inspect_types.mli index 78051b510..7493aa3a6 100644 --- a/daemon/inspect_types.mli +++ b/daemon/inspect_types.mli @@ -85,6 +85,7 @@ and distro = | DISTRO_FREEDOS | DISTRO_FRUGALWARE | DISTRO_GENTOO + | DISTRO_KALI_LINUX | DISTRO_LINUX_MINT | DISTRO_MAGEIA | DISTRO_MANDRIVA diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml index 0ac282435..d8cf571c9 100644 --- a/generator/actions_inspection.ml +++ b/generator/actions_inspection.ml @@ -210,6 +210,10 @@ Frugalware. Gentoo. +=item \"kalilinux\" + +Kali Linux. + =item \"linuxmint\" Linux Mint. -- 2.14.3