diff --git a/SOURCES/0096-Add-AlmaLinux-detection.patch b/SOURCES/1000-Add-AlmaLinux-detection.patch similarity index 68% rename from SOURCES/0096-Add-AlmaLinux-detection.patch rename to SOURCES/1000-Add-AlmaLinux-detection.patch index 267d3ec..9c794da 100644 --- a/SOURCES/0096-Add-AlmaLinux-detection.patch +++ b/SOURCES/1000-Add-AlmaLinux-detection.patch @@ -1,25 +1,25 @@ -From f6b64a276669cd1e9ff0e98db5009083a35f2ef1 Mon Sep 17 00:00:00 2001 +From 3b01a0e630c2e0ccc08b78544dcfd35e6a948b07 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko -Date: Mon, 6 Sep 2021 13:59:24 +0000 +Date: Fri, 8 Apr 2022 16:09:38 +0000 Subject: [PATCH] Add AlmaLinux detection --- m4/guestfs-appliance.m4 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 -index 5a7af51..9481376 100644 +index b0a6ab4..66eef8a 100644 --- a/m4/guestfs-appliance.m4 +++ b/m4/guestfs-appliance.m4 -@@ -104,7 +104,7 @@ AC_ARG_WITH([distro], +@@ -105,7 +105,7 @@ AC_ARG_WITH([distro], ( . /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' ) >&AS_MESSAGE_LOG_FD DISTRO="`. /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`" AS_CASE([$DISTRO], - [FEDORA | RHEL | CENTOS],[DISTRO=REDHAT], + [FEDORA | RHEL | CENTOS | ALMALINUX],[DISTRO=REDHAT], [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], - [ARCH],[DISTRO=ARCHLINUX]) - AC_MSG_RESULT([$DISTRO (from /etc/os-release)]) + [ARCH],[DISTRO=ARCHLINUX], + [OPENMANDRIVA],[DISTRO=OPENMANDRIVA]) -- 2.27.0 diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec index c947787..1625fd8 100644 --- a/SPECS/libguestfs.spec +++ b/SPECS/libguestfs.spec @@ -71,6 +71,11 @@ Patch0017: 0017-launch-libvirt-place-our-virtio-net-pci-device-in-sl.patch Patch0018: 0018-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-ma.patch Patch0019: 0019-launch-libvirt-add-virtio-net-via-the-standard-inter.patch + +# AlmaLinux detection patch +Patch1000: 1000-Add-AlmaLinux-detection.patch + + # Replacement README file. Source4: README-replacement.in @@ -801,9 +806,7 @@ ip addr list ||: ip route list ||: if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then # AlmaLinux: avoid permission denied for yum/dnf cache - mkdir cachedir - sed -e "s|/var/cache/yum|$(pwd)/cachedir|" -e "s|/var/cache/dnf|$(pwd)/cachedir|" /etc/dnf/dnf.conf > yum.conf - extra=--with-supermin-packager-config=$(pwd)/yum.conf + extra= else mkdir cachedir repo # -n 1 because of RHBZ#980502.