It seems that all the newer versions of openSUSE have an 'opensuse-' prefix in their distro ID; hence, check for that prefix at once, keeping compatibility for the old "opensuse" ID. Followup of commit a4e53bcbc52594f8863e7866448640f7ac8ab0f9. --- m4/guestfs-appliance.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 index bcba4c1a1..0a3d6133a 100644 --- a/m4/guestfs-appliance.m4 +++ b/m4/guestfs-appliance.m4 @@ -105,7 +105,7 @@ AC_ARG_WITH([distro], DISTRO="`. /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`" AS_CASE([$DISTRO], [FEDORA | RHEL | CENTOS],[DISTRO=REDHAT], - [OPENSUSE-LEAP | OPENSUSE | SLED | SLES],[DISTRO=SUSE], + [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], [ARCH],[DISTRO=ARCHLINUX]) AC_MSG_RESULT([$DISTRO (from /etc/os-release)]) else -- 2.17.1
Richard W.M. Jones
2018-Oct-02 14:15 UTC
Re: [Libguestfs] [PATCH] rpm: generalize openSUSE support
On Tue, Oct 02, 2018 at 03:10:12PM +0200, Pino Toscano wrote:> It seems that all the newer versions of openSUSE have an 'opensuse-' > prefix in their distro ID; hence, check for that prefix at once, keeping > compatibility for the old "opensuse" ID. > > Followup of commit a4e53bcbc52594f8863e7866448640f7ac8ab0f9. > --- > m4/guestfs-appliance.m4 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 > index bcba4c1a1..0a3d6133a 100644 > --- a/m4/guestfs-appliance.m4 > +++ b/m4/guestfs-appliance.m4 > @@ -105,7 +105,7 @@ AC_ARG_WITH([distro], > DISTRO="`. /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`" > AS_CASE([$DISTRO], > [FEDORA | RHEL | CENTOS],[DISTRO=REDHAT], > - [OPENSUSE-LEAP | OPENSUSE | SLED | SLES],[DISTRO=SUSE], > + [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], > [ARCH],[DISTRO=ARCHLINUX]) > AC_MSG_RESULT([$DISTRO (from /etc/os-release)]) > else > -- > 2.17.1ACK Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/
Possibly Parallel Threads
- [PATCH] build: support openSUSE Leap 15.0
- [PATCH] build: improve and simplify distro detection
- [PATCH v2] appliance: use ID_LIKE as a fallback for SUSE distro detection
- Re: [PATCH] appliance: read ID_LIKE from os-release as a fallback
- Re: [PATCH v2] appliance: use ID_LIKE as a fallback for SUSE distro detection