search for: major_version

...f --git a/src/guestfs-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 gue...

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

...+ b/inspector/virt-inspector.pl @@ -357,7 +357,9 @@ sub output_text_os print $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...

...= OS_DISTRO_CENTOS; + + if (parse_release_file (g, fs, "/etc/centos-release") == -1) + return -1; + + if (match2 (g, fs->product_name, re_centos_old, &major, &minor) || + match2 (g, fs->product_name, re_centos, &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) +...

...an/os-release.html + */ +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 *...

...tfs_h *g, xmlNodePtr node, struct osinfo *osinfo) { CLEANUP_FREE char *content = NULL; - CLEANUP_FREE char *major = NULL, *minor = NULL; 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...

...ning their own logos. Sense prevails! + * + * Use a generic 100K limit for all the images, as logos in the + * RHEL clones have different sizes. */ static char * icon_rhel (guestfs_h *g, struct inspect_fs *fs, size_t *size_r) { - size_t max_size = 0; const char *shadowman; - if (fs->major_version >= 5 && fs->major_version <= 6) - max_size = 17000; - else - max_size = 66000; - if (fs->major_version <= 6) shadowman = "/usr/share/pixmaps/redhat/shadowman-transparent.png"; else shadowman = "/usr/share/pixmaps/fedora-logo-sprite.png&qu...

...x cda1b5d..3d19276 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -232,7 +232,6 @@ parse_os_release (guestfs_h *g, struct inspect_fs *fs, const char *filename) 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

...?> <operatingsystems> <operatingsystem> <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> <filesys...

...NULL, 0, 0, 0, NULL, NULL } }; diff -Nru a/lib/blkid/probe.h b/lib/blkid/probe.h --- a/lib/blkid/probe.h Wed Feb 4 00:21:03 2004 +++ b/lib/blkid/probe.h Wed Feb 4 00:21:03 2004 @@ -209,6 +209,27 @@ __u32 h_blksize; }; +struct ocfs_volume_header { + u_char minor_version[4]; + u_char major_version[4]; + u_char signature[128]; + u_char mount[128]; + u_char mount_len[2]; +}; + +struct ocfs_volume_label { + u_char disk_lock[48]; + u_char label[64]; + u_char label_len[2]; + u_char vol_id[16]; + u_char vol_id_len[2]; +}; + +#define ocfslabellen(o) ((uint)o.label_len[0] + (((uint) o.label_len...

...gt; - <operatingsystem> - <root>/dev/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> - &l...

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

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 ***

...to my TNT. I am trying 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 attac...

...GUESTFS_IS_FILE_OPTS_FOLLOWSYMLINKS, 1, -1) > 0) { + fs->distro = OS_DISTRO_FRUGALWARE; + + if (parse_release_file (g, fs, "/etc/frugalware-release") == -1) + 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) +...

...management; + + if (dst->product_name == 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-...

...;{$1.$2} = 1; + # Modern distros use libata, and IDE devices are presented as sdX + my $libata = 1; + + # RHEL 2, 3 and 4 didn't use libata + # RHEL 5 does use libata, but udev rules call IDE devices hdX anyway + if ($desc->{distro} eq 'rhel') { + if ($desc->{major_version} eq '2' || + $desc->{major_version} eq '3' || + $desc->{major_version} eq '4' || + $desc->{major_version} eq '5') + { + $libata = 0; + } } + # Fedora has used libata since FC7, which is long o...

The first three patches were posted previously: https://www.redhat.com/archives/libguestfs/2010-July/msg00082.html The last two patches in this series change guestfish -i to use this new code. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to

This will allow use of raw data from os description in addition to libvirt XML when writing guest output. --- lib/Sys/VirtV2V/Target/LibVirt.pm | 2 +- lib/Sys/VirtV2V/Target/RHEV.pm | 2 +- v2v/virt-v2v.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Sys/VirtV2V/Target/LibVirt.pm b/lib/Sys/VirtV2V/Target/LibVirt.pm index