search for: os_distro_sles

...ttylinux. diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 8f2e26d..22f1623 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -346,6 +346,8 @@ enum inspect_os_distro { OS_DISTRO_BUILDROOT, OS_DISTRO_CIRROS, OS_DISTRO_FREEDOS, + OS_DISTRO_SUSE_BASED, + OS_DISTRO_SLES, }; enum inspect_os_package_format { diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index b8141d5..91b8516 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -67,6 +67,12 @@ static pcre *re_mdN; static pcre *re_freebsd; static pcre *re_diskbyid; static pcre *re_net...

...osinfo->distro = OS_DISTRO_OPENSUSE; else if (STREQ (content, "rhel")) osinfo->distro = OS_DISTRO_RHEL; - else if (STREQ (content, "sles")) + else if (STREQ (content, "sled") || STREQ (content, "sles")) osinfo->distro = OS_DISTRO_SLES; else if (STREQ (content, "ubuntu")) osinfo->distro = OS_DISTRO_UBUNTU; -- 2.7.4

On Wednesday 09 September 2015 15:54:10 Olaf Hering wrote: > Just poked around in my =libguestfs folder... > > On Wed, Sep 09, Pino Toscano wrote: > > > + if (STRPREFIX (line, "ID=")) { > > This is not handled: > > NAME="SLES" > VERSION="12" > VERSION_ID="12" > PRETTY_NAME="SUSE Linux Enterprise Server

...andriva. MeeGo. +=item \"netbsd\" + +NetBSD. + =item \"openbsd\" OpenBSD. diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index c8dd084..0a4a6f2 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -543,6 +543,8 @@ enum inspect_os_distro { OS_DISTRO_SLES, OS_DISTRO_OPENBSD, OS_DISTRO_ORACLE_LINUX, + OS_DISTRO_FREEBSD, + OS_DISTRO_NETBSD, }; enum inspect_os_package_format { diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index b3c813d..750c27b 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -591,6 +591,7 @@ i...

...andriva. MeeGo. +=item \"netbsd\" + +NetBSD. + =item \"openbsd\" OpenBSD. diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index c8dd084..0a4a6f2 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -543,6 +543,8 @@ enum inspect_os_distro { OS_DISTRO_SLES, OS_DISTRO_OPENBSD, OS_DISTRO_ORACLE_LINUX, + OS_DISTRO_FREEBSD, + OS_DISTRO_NETBSD, }; enum inspect_os_package_format { diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index b1a2f8f..ff6a156 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -591,6 +591,7 @@ i...

...else if (STREQ (content, "opensuse")) + osinfo->distro = OS_DISTRO_OPENSUSE; + else if (STREQ (content, "rhel")) + osinfo->distro = OS_DISTRO_RHEL; + else if (STREQ (content, "sled") || STREQ (content, "sles")) + osinfo->distro = OS_DISTRO_SLES; + else if (STREQ (content, "ubuntu")) + osinfo->distro = OS_DISTRO_UBUNTU; + else if (STRPREFIX (content, "win")) + osinfo->distro = OS_DISTRO_WINDOWS; + else + debug (g, "osinfo: warning: unknown <distro> '%s'", content); +...

...else if (STREQ (content, "opensuse")) + osinfo->distro = OS_DISTRO_OPENSUSE; + else if (STREQ (content, "rhel")) + osinfo->distro = OS_DISTRO_RHEL; + else if (STREQ (content, "sled") || STREQ (content, "sles")) + osinfo->distro = OS_DISTRO_SLES; + else if (STREQ (content, "ubuntu")) + osinfo->distro = OS_DISTRO_UBUNTU; + else if (STRPREFIX (content, "win")) + osinfo->distro = OS_DISTRO_WINDOWS; + else + debug (g, "osinfo: warning: unknown <distro> '%s'", content); +...

...else if (STREQ (content, "opensuse")) + osinfo->distro = OS_DISTRO_OPENSUSE; + else if (STREQ (content, "rhel")) + osinfo->distro = OS_DISTRO_RHEL; + else if (STREQ (content, "sled") || STREQ (content, "sles")) + osinfo->distro = OS_DISTRO_SLES; + else if (STREQ (content, "ubuntu")) + osinfo->distro = OS_DISTRO_UBUNTU; + else if (STRPREFIX (content, "win")) + osinfo->distro = OS_DISTRO_WINDOWS; + else + debug (g, "osinfo: warning: unknown <distro> '%s'", content); +...

...else if (STREQ (content, "opensuse")) + osinfo->distro = OS_DISTRO_OPENSUSE; + else if (STREQ (content, "rhel")) + osinfo->distro = OS_DISTRO_RHEL; + else if (STREQ (content, "sled") || STREQ (content, "sles")) + osinfo->distro = OS_DISTRO_SLES; + else if (STREQ (content, "ubuntu")) + osinfo->distro = OS_DISTRO_UBUNTU; + else if (STRPREFIX (content, "win")) + osinfo->distro = OS_DISTRO_WINDOWS; + else + debug (g, "osinfo: warning: unknown <distro> '%s'", content); +...

...}; enum inspect_os_package_format { diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index 0e64e33..4d41086 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -216,6 +216,8 @@ parse_os_release (guestfs_h *g, struct inspect_fs *fs, const char *filename) distro = OS_DISTRO_SLES; else if (VALUE_IS ("ubuntu")) distro = OS_DISTRO_UBUNTU; + else if (VALUE_IS ("void")) + distro = OS_DISTRO_VOID_LINUX; } else if (STRPREFIX (line, "PRETTY_NAME=")) { free (product_name); product_name = safe_strndup (g, v...

...else if (STREQ (content, "opensuse")) + osinfo->distro = OS_DISTRO_OPENSUSE; + else if (STREQ (content, "rhel")) + osinfo->distro = OS_DISTRO_RHEL; + else if (STREQ (content, "sled") || STREQ (content, "sles")) + osinfo->distro = OS_DISTRO_SLES; + else if (STREQ (content, "ubuntu")) + osinfo->distro = OS_DISTRO_UBUNTU; + else if (STRPREFIX (content, "win")) + osinfo->distro = OS_DISTRO_WINDOWS; + else + debug (g, "osinfo: warning: unknown <distro> '%s'", content); +...

...suse_release (guestfs_h *g, struct inspect_fs *fs, const char *filename) /* Match SLES first because openSuSE regex overlaps some SLES release strings */ if (match (g, fs->product_name, re_sles) || match (g, fs->product_name, re_nld)) { + char *major, *minor; + fs->distro = OS_DISTRO_SLES; /* Second line contains version string */ @@ -427,9 +400,9 @@ parse_suse_release (guestfs_h *g, struct inspect_fs *fs, const char *filename) major = match1 (g, lines[1], re_sles_version); if (major == NULL) goto out; - fs->major_version = guestfs_int_parse_unsigned_in...

Hi, this adds an helper version struct, and uses it in the backends (for the libvirt and qemu versions) and inspection code. This also moves common code to that, so it is not repeated in many places. This should help with the small refactoring proposed with https://www.redhat.com/archives/libguestfs/2016-May/msg00070.html Thanks, Pino Toscano (2): src: start unifying version handling

Hi, this adds an helper version struct, and uses it in the backends (for the libvirt and qemu versions) and inspection code. This also moves common code to that, so it is not repeated in many places. This should help with the small refactoring proposed with https://www.redhat.com/archives/libguestfs/2016-May/msg00070.html Thanks, Pino Toscano (2): src: start unifying version handling

v9 was here: https://www.redhat.com/archives/libguestfs/2017-July/msg00139.html This depends on these three series (the first two being single minor patches): https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html https://www.redhat.com/archives/libguestfs/2017-July/msg00215.html There is no substantive change. I

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

Hi all, Here is an update of the series fixing Pino's latest comment. It just doesn't implement the change based on never-accepted run commands patch. Cédric Bosdonnat (9): lib/osinfo.c: Extract xml processing into a callback lib: extract osinfo DB traversing API mllib: ocaml wrapper for lib/osinfo builder: rename docs test script builder: add a template parameter to get_index

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

Hi all, Here is a new version of the virt-builder-repository series taking care of Pino's comments. It has also been rebased on recent master. Cédric Bosdonnat (7): mllib: factorize code to add Checksum.get_checksum function Move xml and xpath_helpers OCAML code to mllib mllib: expose libosinfo DB reading functions in mllib builder: rename docs test script builder: add

v10: https://www.redhat.com/archives/libguestfs/2017-July/msg00245.html No actual change here, but I rebased and retested. Also this series now does not depend on any other patch series since everything else needed is upstream. Rich.