search for: minor_version

...internal.h b/src/guestfs-internal.h index 6b3cfdf..0b207b2 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -605,8 +605,7 @@ struct inspect_fs { enum inspect_os_package_management package_management; char *product_name; char *product_variant; - int major_version; - int minor_version; + struct version version; char *arch; char *hostname; char *windows_systemroot; @@ -933,7 +932,12 @@ extern void guestfs_int_waitpid_noerror (pid_t pid); /* version.c */ extern void guestfs_int_version_from_libvirt (struct version *v, int vernum); extern void guestfs_int_version_from_...

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

...os->{os}, " " if exists $os->{os}; print $os->{distro}, " " if exists $os->{distro}; - print $os->{version}, " " if exists $os->{version}; + print $os->{major_version} if exists $os->{major_version}; + print ".", $os->{minor_version} if exists $os->{minor_version}; + print " "; print "on ", $os->{root_device}, ":\n"; print __" Mountpoints:\n"; @@ -448,7 +450,8 @@ sub output_xml_os foreach ( [ "name" => "os" ], [ "dis...

...ed to be performed before the Red-Hat one. */ if (guestfs_is_file_opts (g, "/etc/oracle-release", GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) { @@ -376,6 +376,34 @@ guestfs_int_check_linux_root (guestfs_h *g, struct inspect_fs *fs) fs->minor_version = 0; } } + else if (guestfs_is_file_opts (g, "/etc/centos-release", + GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) { + fs->distro = OS_DISTRO_CENTOS; + + if (parse_release_file (g, fs, "/etc/centos-release") == -1) +...

...*/ +static int +parse_os_release (guestfs_h *g, struct inspect_fs *fs, const char *filename) +{ + int64_t size; + CLEANUP_FREE_STRING_LIST char **lines = NULL; + size_t i; + enum inspect_os_distro distro = OS_DISTRO_UNKNOWN; + CLEANUP_FREE char *product_name = NULL; + int major_version = -1, minor_version = -1; + + /* Don't trust guestfs_read_lines not to break with very large files. + * Check the file size is something reasonable first. + */ + size = guestfs_filesize (g, filename); + if (size == -1) + /* guestfs_filesize failed and has already set error in handle */ + return -1; +...

...; content = (char *) xmlNodeGetContent (node); if (content) { - if (match2 (g, content, re_major_minor, &major, &minor)) { - osinfo->major_version = guestfs_int_parse_unsigned_int (g, major); - if (osinfo->major_version == -1) - return -1; - osinfo->minor_version = guestfs_int_parse_unsigned_int (g, minor); - if (osinfo->minor_version == -1) - return -1; + struct version version; + int res = guestfs_int_version_from_x_y (g, &version, content); + if (res < 0) + return -1; + else if (res > 0) { + osinfo->major...

Hi Richard I've noticed this snippet in import-to-ovirt.pl my $minor_version = $g->inspect_get_major_version ($root); I guess you meant here my $minor_version = $g->inspect_get_minor_version ($root); Emmanuel

...em> <root>/dev/sda</root> <name>linux</name> <distro>ubuntu</distro> <product_name>Ubuntu 10.10 &quot;Maverick Meerkat&quot; - Release amd64 (20101007)</product_name> <major_version>10</major_version> <minor_version>10</minor_version> <format>installer</format> <live/> <mountpoints> <mountpoint dev="/dev/sda">/</mountpoint> </mountpoints> <filesystems> <filesystem dev="/dev/sda"> <type&...

...ev/sda</root> - <name>linux</name> - <distro>debian</distro> - <product_name>Debian GNU/Linux 5.0.5 &quot;Lenny&quot; - Official amd64 NETINST Binary-1 20100627-10:37</product_name> - <major_version>5</major_version> - <minor_version>0</minor_version> - <format>installer</format> - <netinst/> - <mountpoints> - <mountpoint dev="/dev/sda">/</mountpoint> - </mountpoints> - <filesystems> - <filesystem dev="/dev/sda"> -...

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

...to receive incoming H323 to terminate to the call on the TNT. Linux mybox 2.6.9-1.667 #1 Tue Nov 2 14:50:10 EST 2004 x86_64 x86_64 x86_64 GNU/Linux Asterisk CVS-HEAD-11/17/04-21:47:41 built by root@bit64.dvig.com on a x86_64 running Linux From openh323 version.h: #define MAJOR_VERSION 1 #define MINOR_VERSION 15 From pwlib version.h: #define MAJOR_VERSION 1 #define MINOR_VERSION 8 -- Tracy Reed http://copilotcom.com This message is cryptographically signed for your protection. Info: http://copilotconsulting.com/sig -------------- next part -------------- A non-text attachment was scrubbed... Na...

Hi I am try to write rpm spec for install tomcat on a linux machine.But while build the rpm i found following error + /usr/lib/rpm/find-debuginfo.sh --strict-build-id /home/rpmbuild/BUILD/Install_tomcat-1.0 extracting debug info from /home/rpmbuild/BUILDROOT/Install_tomcat-1.0-1.el6.x86_64/usr/local/jdk1.7.0_13/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so ***

...return -1; + + if (match2 (g, fs->product_name, re_frugalware, &major, &minor)) { + fs->major_version = guestfs_int_parse_unsigned_int (g, major); + free (major); + if (fs->major_version == -1) { + free (minor); + return -1; + } + fs->minor_version = guestfs_int_parse_unsigned_int (g, minor); + free (minor); + if (fs->minor_version == -1) + return -1; + } + } skip_release_checks:; diff --git a/src/inspect-fs.c b/src/inspect-fs.c index b239302..b6f03ee 100644 --- a/src/inspect-fs.c +++ b/src/inspect-fs.c @@ -499,6...

...ame == NULL) { + dst->product_name = src->product_name; + src->product_name = NULL; + } + + if (dst->product_variant == NULL) { + dst->product_variant= src->product_variant; + src->product_variant = NULL; + } + + if (dst->major_version == 0 && dst->minor_version == 0) { + dst->major_version = src->major_version; + dst->minor_version = src->minor_version; + } + + if (dst->arch == NULL) { + dst->arch = src->arch; + src->arch = NULL; + } + + if (dst->hostname == NULL) { + dst->hostname = src->hostname; +...

...(\\d+)(?:[\\.\\d]+)?)?)\\s+\\((?:[^)]+)\\)$", 0) static void check_architecture (guestfs_h *g, struct inspect_fs *fs); static int check_hostname_unix (guestfs_h *g, struct inspect_fs *fs); @@ -414,6 +415,26 @@ guestfs_int_check_linux_root (guestfs_h *g, struct inspect_fs *fs) fs->minor_version = 0; } } + else if (guestfs_is_file_opts (g, "/etc/altlinux-release", + GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) { + fs->distro = OS_DISTRO_ALTLINUX; + + if (parse_release_file (g, fs, "/etc/altlinux-release") == -1) +...

...ame == NULL) { + dst->product_name = src->product_name; + src->product_name = NULL; + } + + if (dst->product_variant == NULL) { + dst->product_variant= src->product_variant; + src->product_variant = NULL; + } + + if (dst->major_version == 0 && dst->minor_version == 0) { + dst->major_version = src->major_version; + dst->minor_version = src->minor_version; + } + + if (dst->arch == NULL) { + dst->arch = src->arch; + src->arch = NULL; + } + + if (dst->hostname == NULL) { + dst->hostname = src->hostname; +...

...t; <root>/dev/sda3</root> <name>linux</name> <arch>x86_64</arch> <distro>sles</distro> <product_name>SUSE Linux Enterprise Server 12 (x86_64)</product_name> <major_version>12</major_version> <minor_version>0</minor_version> <package_format>rpm</package_format> <package_management>zypper</package_management> <hostname>linux-luwo.site</hostname> <format>installed</format> <mountpoints> <mountpoint dev="/dev...

...char buf[value_len + 1]; snprintf (buf, sizeof buf, "%*s", (int) value_len, value); major_version = guestfs_int_parse_unsigned_int (g, buf); - free (major); /* Handle cases where VERSION_ID is not a number. */ if (major_version != -1) minor_version = 0; -- 2.5.0

....c | 3 ++- src/osinfo.c | 11 ++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 03f1034..2b49011 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -861,6 +861,7 @@ struct osinfo { int minor_version; char *arch; int is_live_disk; + bool is_installer; #if 0 /* Not yet available in libosinfo database. */ diff --git a/src/inspect-fs-cd.c b/src/inspect-fs-cd.c index bb28c0f..10e9d54 100644 --- a/src/inspect-fs-cd.c +++ b/src/inspect-fs-cd.c @@ -526,7 +526,8 @@ guestfs_int_check_instal...