Libguestfs - Oct 2018 - [PATCH] inspection: Parse os-release "opensuse-leap" as opensuse

I'm afraid I wasn't able to test this patch (except compile testing)
so far.  Will report back if I'm able to test it against an OpenSUSE
15 image.

Rich.

---
 daemon/inspect_fs_unix.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml
index ba9f0ed5a..4dd89fa8f 100644
--- a/daemon/inspect_fs_unix.ml
+++ b/daemon/inspect_fs_unix.ml
@@ -143,7 +143,7 @@ and distro_of_os_release_id = function
   | "kali" -> Some DISTRO_KALI_LINUX
   | "mageia" -> Some DISTRO_MAGEIA
   | "neokylin" -> Some DISTRO_NEOKYLIN
-  | "opensuse" -> Some DISTRO_OPENSUSE
+  | "opensuse" | "opensuse-leap" -> Some DISTRO_OPENSUSE
   | "pld" -> Some DISTRO_PLD_LINUX
   | "rhel" -> Some DISTRO_RHEL
   | "sles" | "sled" -> Some DISTRO_SLES
-- 
2.19.0.rc0

On Monday, 1 October 2018 10:54:08 CEST Richard W.M. Jones
wrote:
> ---
>  daemon/inspect_fs_unix.ml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml
> index ba9f0ed5a..4dd89fa8f 100644
> --- a/daemon/inspect_fs_unix.ml
> +++ b/daemon/inspect_fs_unix.ml
> @@ -143,7 +143,7 @@ and distro_of_os_release_id = function
>    | "kali" -> Some DISTRO_KALI_LINUX
>    | "mageia" -> Some DISTRO_MAGEIA
>    | "neokylin" -> Some DISTRO_NEOKYLIN
> -  | "opensuse" -> Some DISTRO_OPENSUSE
> +  | "opensuse" | "opensuse-leap" -> Some
DISTRO_OPENSUSE
I can confirm this works, so ACK.

Thanks,
-- 
Pino Toscano

On Mon, Oct 01, 2018 at 09:54:07AM +0100, Richard W.M. Jones
wrote:
> I'm afraid I wasn't able to test this patch (except compile
testing)
> so far.  Will report back if I'm able to test it against an OpenSUSE
> 15 image.
I have now tested virt-inspector and virt-v2v (-o null) using the disk
image below, and was able to reproduce the original bug and test that
the patch fixes the bug.

https://download.opensuse.org/repositories/Cloud:/Images:/Leap_15.0/images/openSUSE-Leap-15.0-EC2-HVM.x86_64-0.2.0-Buildlp150.1.5.raw.xz

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/