Libguestfs - Oct 2021 - [PATCH] daemon/inspect_fs_unix: recognize modern Pardus GNU/Linux releases

Recent Pardus releases seem to have abandoned the original
"/etc/pardus-release" file, which the current Pardus detection, from
commit 233530d3541d ("inspect: Add detection of Pardus.", 2010-10-29),
is
based upon.

Instead, Pardus apparently adopted the "/etc/os-release" specification
<https://www.freedesktop.org/software/systemd/man/os-release.html>, with
"ID=pardus". Extend the "distro_of_os_release_id" function
accordingly.
Keep the original method for recognizing earlier releases.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1993842
Signed-off-by: Laszlo Ersek <lersek at redhat.com>
---
 daemon/inspect_fs_unix.ml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml
index 557f328333f0..652bacc0fc18 100644
--- a/daemon/inspect_fs_unix.ml
+++ b/daemon/inspect_fs_unix.ml
@@ -151,6 +151,7 @@ and distro_of_os_release_id = function
   | "openmandriva" -> Some DISTRO_OPENMANDRIVA
   | "opensuse" -> Some DISTRO_OPENSUSE
   | s when String.is_prefix s "opensuse-" -> Some DISTRO_OPENSUSE
+  | "pardus" -> Some DISTRO_PARDUS
   | "pld" -> Some DISTRO_PLD_LINUX
   | "rhel" -> Some DISTRO_RHEL
   | "sles" | "sled" -> Some DISTRO_SLES
-- 
2.19.1.3.g30247aa5d201

On Fri, Oct 01, 2021 at 02:53:38PM +0200, Laszlo Ersek
wrote:
> Recent Pardus releases seem to have abandoned the original
> "/etc/pardus-release" file, which the current Pardus detection,
from
> commit 233530d3541d ("inspect: Add detection of Pardus.",
2010-10-29), is
> based upon.
> 
> Instead, Pardus apparently adopted the "/etc/os-release"
specification
> <https://www.freedesktop.org/software/systemd/man/os-release.html>,
with
> "ID=pardus". Extend the "distro_of_os_release_id"
function accordingly.
> Keep the original method for recognizing earlier releases.
> 
> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1993842
> Signed-off-by: Laszlo Ersek <lersek at redhat.com>
> ---
>  daemon/inspect_fs_unix.ml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml
> index 557f328333f0..652bacc0fc18 100644
> --- a/daemon/inspect_fs_unix.ml
> +++ b/daemon/inspect_fs_unix.ml
> @@ -151,6 +151,7 @@ and distro_of_os_release_id = function
>    | "openmandriva" -> Some DISTRO_OPENMANDRIVA
>    | "opensuse" -> Some DISTRO_OPENSUSE
>    | s when String.is_prefix s "opensuse-" -> Some
DISTRO_OPENSUSE
> +  | "pardus" -> Some DISTRO_PARDUS
>    | "pld" -> Some DISTRO_PLD_LINUX
>    | "rhel" -> Some DISTRO_RHEL
>    | "sles" | "sled" -> Some DISTRO_SLES
Based on testing in the bug, ACK

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top