[PATCH] daemon/inspect_fs_unix: recognize modern Pardus GNU/Linux releases
by Laszlo Ersek
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(a)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
2 years, 7 months
- 2
- 2
[virt-v2v PATCH 0/4] Build and test suite fixes
by Laszlo Ersek
After
(1) applying the libnbd patch at
<https://listman.redhat.com/archives/libguestfs/2021-September/msg00158.html>,
(2) creating a symlink to the just-built nbdkit binary under ~/bin,
(3) applying these virt-v2v patches, and
(4) masking the in-place v2v test temporarily with
SKIP_TEST_V2V_IN_PLACE_SH=1,
I can run "make" and "make check" successfully in the virt-v2v tree.
Thanks,
Laszlo
Laszlo Ersek (4):
Makefile.am: use $(LIBNBD_LIBS) for linking OCaml programs
test-v2v-cdrom: update the CD-ROM's bus to SATA in the converted
domain
test-v2v-i-ova: update the CD-ROM's bus to SATA in the converted
domain
test-v2v-i-ova: spell out viosock element in output domain XML
convert/Makefile.am | 1 +
output/Makefile.am | 1 +
v2v/Makefile.am | 1 +
tests/test-v2v-cdrom.expected | 2 +-
tests/test-v2v-cdrom.xml.in | 4 +++-
tests/test-v2v-i-ova.xml | 3 ++-
6 files changed, 9 insertions(+), 3 deletions(-)
--
2.19.1.3.g30247aa5d201
2 years, 7 months
- 3
- 18