search for: release_file

...s.ml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml index 59e26a05e..3ad119306 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -68,7 +68,7 @@ let arch_binaries = *) let rec parse_os_release release_file data = let chroot = Chroot.create ~name:"parse_os_release" () in - let lines = Chroot.f chroot (fun () -> read_small_file release_file) () in + let lines = Chroot.f chroot read_small_file release_file in match lines with | None -> false @@ -182,7 +182,7 @@ and distro_of...

...file. > + * > + * Only few fields are parsed, falling back to the usual detection if we > + * cannot read all of them. > + * > + * For the format of os-release, see also: > + * http://www.freedesktop.org/software/systemd/man/os-release.html > + *) > +let rec parse_os_release release_file data = > + let chroot = Chroot.create ~name:"parse_os_release" () in > + let lines = > + Chroot.f chroot ( > + fun () -> > + if not (is_small_file release_file) then ( > + eprintf "%s: not a regular file or too large\n" release_file...

Add a simple helper to turn a list of strings into key/value pairs, splitting by '='. --- daemon/utils.ml | 15 +++++++++++++++ daemon/utils.mli | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/daemon/utils.ml b/daemon/utils.ml index d87ad75db..fd1681a86 100644 --- a/daemon/utils.ml +++ b/daemon/utils.ml @@ -229,3 +229,18 @@ let unix_canonical_path path = let path =

...bin/sh" ] + +(* Parse a os-release file. + * + * Only few fields are parsed, falling back to the usual detection if we + * cannot read all of them. + * + * For the format of os-release, see also: + * http://www.freedesktop.org/software/systemd/man/os-release.html + *) +let rec parse_os_release release_file data = + let chroot = Chroot.create ~name:"parse_os_release" () in + let lines = + Chroot.f chroot ( + fun () -> + if not (is_small_file release_file) then ( + eprintf "%s: not a regular file or too large\n" release_file; + None + ) +...

Changes from v2 to v3: - split_key_value_strings renamed to parse_key_value_strings Changes from v1 to v2: - split the "simple unquoting" as helper - pass the unquoting function to split_key_value_strings - use right unquoting function when applying split_key_value_strings Pino Toscano (2): daemon: add split_key_value_strings helper daemon: use parse_key_value_strings

Changes from v1 to v2: - split the "simple unquoting" as helper - pass the unquoting function to split_key_value_strings - use right unquoting function when applying split_key_value_strings Pino Toscano (2): daemon: add split_key_value_strings helper daemon: use split_key_value_strings daemon/inspect_fs_unix.ml | 93 +++++++++++++++++++---------------------------- daemon/md.ml

...bin/sh" ] + +(* Parse a os-release file. + * + * Only few fields are parsed, falling back to the usual detection if we + * cannot read all of them. + * + * For the format of os-release, see also: + * http://www.freedesktop.org/software/systemd/man/os-release.html + *) +let rec parse_os_release release_file data = + let chroot = Chroot.create ~name:"parse_os_release" () in + let lines = Chroot.f chroot (fun () -> read_small_file release_file) () in + + match lines with + | None -> false + | Some lines -> + List.iter ( + fun line -> + let line = String.trim...

...ompile "(\\d+)\\.(\\d+) PLD Linux" +let re_neokylin_version = PCRE.compile "^V(\\d+)Update(\\d+)$" let arch_binaries = [ "/bin/bash"; "/bin/ls"; "/bin/echo"; "/bin/rm"; "/bin/sh" ] @@ -94,7 +95,7 @@ let rec parse_os_release release_file data = else if key = "PRETTY_NAME" then data.product_name <- Some value else if key = "VERSION_ID" then - parse_version_from_major_minor value data + parse_os_release_version_id value data ) ) lin...

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.

Hi all, I'd like to try rolling a somewhat stripped down and customized CentOS DVD. This is particularly interesting to me now that CentOS 5.5 is 2 DVDs. I dare not call it a new distro as I suspect I will be the only one to use it. ;) I've been googling for ways to do this, figuring it must be somewhat straight forward, but my google-fu is weak it seems. Can someone point me

...748136700c8d8. --- daemon/inspect_fs_unix.ml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml index ba947c30e..8c7b1d83c 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -111,6 +111,10 @@ let rec parse_os_release release_file data = data.version <- Some (0, 0); true + (* No version detected, so fall back to other ways. *) + | { version = None } -> + false + | _ -> true ) -- 2.13.6

...alternative to the ArcGIS toolbox STARS to format the input data for the SSN package for Spatial Statistical Modeling on Stream Networks (https://cran.r-project.org/web/packages/SSN/index.html). For more information see https://htmlpreview.github.io/?https://github.com/MiKatt/openSTARS/master/release_files/release_announcement.html . Any comments and suggestions are very welcome. All the best, Mira -- Dr. Mira Kattwinkel Quantitative Landscape Ecology Institute for Environmental Sciences University of Koblenz-Landau Fortstra?e 7 76829 Landau Germany Phone: + 49 6341 280-31553 Office: Building...

...alternative to the ArcGIS toolbox STARS to format the input data for the SSN package for Spatial Statistical Modeling on Stream Networks (https://cran.r-project.org/web/packages/SSN/index.html). For more information see https://htmlpreview.github.io/?https://github.com/MiKatt/openSTARS/master/release_files/release_announcement.html . Any comments and suggestions are very welcome. All the best, Mira -- Dr. Mira Kattwinkel Quantitative Landscape Ecology Institute for Environmental Sciences University of Koblenz-Landau Fortstra?e 7 76829 Landau Germany Phone: + 49 6341 280-31553 Office: Building...

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.

Few improvements to the results of the inspection on some distros. Pino Toscano (5): inspect: factorize list of rolling distros inspect: detect Gentoo from os-release inspect: fully detect Arch Linux from os-release inspect: return osinfo short IDs for rolling distros inspect: correct osinfo ID for ALT Linux >= 8 daemon/inspect_fs_unix.ml | 15 +++++++++------

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

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

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.