2022-01-11 17:18:03 +00:00
|
|
|
From 336ecfab3bb1e14deea9ade891fb772e0698f8d8 Mon Sep 17 00:00:00 2001
|
2021-12-07 18:26:14 +00:00
|
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
|
Date: Fri, 1 Oct 2021 14:53:38 +0200
|
|
|
|
|
Subject: [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@redhat.com>
|
|
|
|
|
Message-Id: <20211001125338.8956-1-lersek@redhat.com>
|
|
|
|
|
Acked-by: Richard W.M. Jones <rjones@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 557f32833..652bacc0f 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
|
|
|
|
|
--
|
2022-01-11 17:18:03 +00:00
|
|
|
2.19.1.3.g30247aa5d201
|
2021-12-07 18:26:14 +00:00
|
|
|
|
