search for: re_scientific_linux_no_minor

...+++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/inspect_fs_unix.c b/src/inspect_fs_unix.c index 0fa3e83..34d218f 100644 --- a/src/inspect_fs_unix.c +++ b/src/inspect_fs_unix.c @@ -110,7 +110,6 @@ compile_regexps (void) COMPILE (re_scientific_linux_no_minor, "Scientific Linux.*release (\\d+)", 0); COMPILE (re_major_minor, "(\\d+)\\.(\\d+)", 0); - COMPILE (re_aug_seq, "/\\d+$", 0); COMPILE (re_xdev, "^/dev/(h|s|v|xv)d([a-z]+)(\\d*)$", 0); COMPILE (re_cciss, "^/dev/(cciss/c\\d+d\\d+)(?:p...

...ltaneously. - */ -static pcre *re_fedora; -static pcre *re_rhel_old; -static pcre *re_rhel; -static pcre *re_rhel_no_minor; -static pcre *re_centos_old; -static pcre *re_centos; -static pcre *re_centos_no_minor; -static pcre *re_scientific_linux_old; -static pcre *re_scientific_linux; -static pcre *re_scientific_linux_no_minor; -static pcre *re_oracle_linux_old; -static pcre *re_oracle_linux; -static pcre *re_oracle_linux_no_minor; -static pcre *re_major_minor; -static pcre *re_xdev; -static pcre *re_cciss; -static pcre *re_mdN; -static pcre *re_freebsd_mbr; -static pcre *re_freebsd_gpt; -static pcre *re_diskbyid; -stati...

...ons(-) diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index 01a59f1..f55e53b 100644 --- a/src/inspect-fs-unix.c +++ b/src/inspect-fs-unix.c @@ -58,8 +58,8 @@ COMPILE_REGEXP (re_scientific_linux, "Scientific Linux.*release (\\d+)\\.(\\d+)", 0) COMPILE_REGEXP (re_scientific_linux_no_minor, "Scientific Linux.*release (\\d+)", 0) - COMPILE_REGEXP (re_oracle_linux_old, - "Oracle Linux.*release (\\d+).*Update (\\d+)", 0) +COMPILE_REGEXP (re_oracle_linux_old, + "Oracle Linux.*release (\\d+).*Update (\\d+)", 0...

...ct-fs-unix.c b/src/inspect-fs-unix.c > index 01a59f1..f55e53b 100644 > --- a/src/inspect-fs-unix.c > +++ b/src/inspect-fs-unix.c > @@ -58,8 +58,8 @@ COMPILE_REGEXP (re_scientific_linux, > "Scientific Linux.*release (\\d+)\\.(\\d+)", 0) > COMPILE_REGEXP (re_scientific_linux_no_minor, > "Scientific Linux.*release (\\d+)", 0) > - COMPILE_REGEXP (re_oracle_linux_old, > - "Oracle Linux.*release (\\d+).*Update (\\d+)", 0) > +COMPILE_REGEXP (re_oracle_linux_old, > + "Oracle Linux.*release (\\d+...

...ct-fs-unix.c >> index 01a59f1..f55e53b 100644 >> --- a/src/inspect-fs-unix.c >> +++ b/src/inspect-fs-unix.c >> @@ -58,8 +58,8 @@ COMPILE_REGEXP (re_scientific_linux, >> "Scientific Linux.*release (\\d+)\\.(\\d+)", 0) >> COMPILE_REGEXP (re_scientific_linux_no_minor, >> "Scientific Linux.*release (\\d+)", 0) >> - COMPILE_REGEXP (re_oracle_linux_old, >> - "Oracle Linux.*release (\\d+).*Update (\\d+)", 0) >> +COMPILE_REGEXP (re_oracle_linux_old, >> + "Oracle...

...uestfs_int_parse_unsigned_int (g, minor); + fs->version.v_minor = guestfs_int_parse_unsigned_int (g, minor); free (minor); - if (fs->minor_version == -1) + if (fs->version.v_minor == -1) return -1; } else if ((major = match1 (g, fs->product_name, re_scientific_linux_no_minor)) != NULL) { fs->distro = OS_DISTRO_SCIENTIFIC_LINUX; - fs->major_version = guestfs_int_parse_unsigned_int (g, major); + fs->version.v_major = guestfs_int_parse_unsigned_int (g, major); free (major); - if (fs->major_version == -1) + if (fs->version.v...

...)\\.(\\d+)" +let re_centos_no_minor = PCRE.compile "CentOS.*release (\\d+)" +let re_scientific_linux_old = + PCRE.compile "Scientific Linux.*release (\\d+).*Update (\\d+)" +let re_scientific_linux = + PCRE.compile "Scientific Linux.*release (\\d+)\\.(\\d+)" +let re_scientific_linux_no_minor = + PCRE.compile "Scientific Linux.*release (\\d+)" +let re_oracle_linux_old = + PCRE.compile "Oracle Linux.*release (\\d+).*Update (\\d+)" +let re_oracle_linux = + PCRE.compile "Oracle Linux.*release (\\d+)\\.(\\d+)" +let re_oracle_linux_no_minor = PCRE.compile &qu...

..._centos_no_minor = Str.regexp "CentOS.*release \\([0-9]+\\)" +let re_scientific_linux_old = + Str.regexp "Scientific Linux.*release \\([0-9]+\\).*Update \\([0-9]+\\)" +let re_scientific_linux = + Str.regexp "Scientific Linux.*release \\([0-9]+\\)\\.\\([0-9]+\\)" +let re_scientific_linux_no_minor = + Str.regexp "Scientific Linux.*release \\([0-9]+\\)" +let re_oracle_linux_old = + Str.regexp "Oracle Linux.*release \\([0-9]+\\).*Update \\([0-9]+\\)" +let re_oracle_linux = + Str.regexp "Oracle Linux.*release \\([0-9]+\\)\\.\\([0-9]+\\)" +let re_oracle_linux_no_...

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

This is the (incomplete) patch which reimplements inspection APIs in the daemon. All ‘XXX’s in this patch indicate areas which are not yet implemented or need further work. Rich.

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

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

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.

v6 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html and this requires the utilities refactoring posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html Inspection is now complete[*], although not very well tested. I'm intending to compare the output of many guests using old & new virt-inspector to see if I can find any

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.