search for: inspect_fs_unix

...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 +++++++++------ inspector/expected-archlinux.img.xml | 1 + lib/inspect-osinfo.c | 8 ++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) -- 2.20.1

Select non-comment labels using an augeas path to return the correct nodes in the first instance, rather than applying a regular expression to all results. Iterate over returned matches using a char** iterator. Use asprintf() to ensure the path string buffer is the correct size. --- src/inspect_fs_unix.c | 50 +++++++++++++++++++++--------------------------- 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)...

I'm afraid I wasn't able to test this patch (except compile testing) so far. Will report back if I'm able to test it against an OpenSUSE 15 image. Rich.

Followup of commit 70407cd622dda6f088a0876e1e1ae669e9f8a281 for openSUSE Thumbleweed. --- daemon/inspect_fs_unix.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml index 4dd89fa8f..925db06a3 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -143,7 +143,7 @@ and distro_of_os_release_id = function | "kali&q...

--- src/inspect_fs_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inspect_fs_unix.c b/src/inspect_fs_unix.c index 1ef4ca4..5695adc 100644 --- a/src/inspect_fs_unix.c +++ b/src/inspect_fs_unix.c @@ -1113,7 +1113,7 @@ map_md_devices(guestfs_h *g, Hash_table **map) free(uuid_path);...

Even though the list of checks is very short, at least this migrates from imperative checks to a "declarative" one. There should be no behaviour change, other than using os-release if it contains all the needed information. --- daemon/inspect_fs_unix.ml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml index 53c86e878..e2a7364bd 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -698,6 +698,17 @@ let rec check_openbsd_root mountab...

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 =

Rely on currying, and avoid extra helper functions. No behaviour changes. --- daemon/inspect_fs_unix.ml | 20 ++++++++++---------- daemon/inspect_fs_windows.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 +6...

From: Michael Scherer <misc at zarb.org> Without this, configure will always enable erlang, no matter what argument are passed. Now, we can disable it, even if configure still need the erlang compiler for some obscure reason. --- configure.ac | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 337a3ed..e0bed2f 100644 ---

Thanks: Qingzheng Zhang --- daemon/inspect_fs.ml | 7 +++++++ daemon/inspect_fs_unix.ml | 16 +++++++++++++++- daemon/inspect_types.ml | 2 ++ daemon/inspect_types.mli | 1 + generator/actions_inspection.ml | 4 ++++ inspector/virt-inspector.rng | 1 + 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs...

...does not contain VERSION_ID, and it is not an exception (like Void Linux), then discard the results got from os-release. This matches what the old C code did -- e.g. see commit 32d19e3289bc259901f77398703f16cf6eabd510, and the changes in commit 0251c0fcaa4fbb3b42968792996748136700c8d8. --- 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.versio...

--- daemon/inspect_fs_unix.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml index ba9f0ed5a..4dd89fa8f 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -143,7 +143,7 @@ and distro_of_os_release_id = function | "kali&q...

The regular expression matching disk name assumed that there was only a single letter suffix. This change handles a naming scheme for any number of disks. --- src/inspect_fs_unix.c | 51 +++++++++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 20 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-inspection-Fix-fstab-device-mapping-for-26-disks.patch Type: text/x-patch Size: 3654 bytes Desc: no...

...m 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 daemon/inspect_fs_unix.ml | 93 +++++++++++++++++++---------------------------- daemon/md.ml | 9 ++--- daemon/utils.ml | 16 ++++++++ daemon/utils.mli | 11 ++++++ 4 files changed, 67 insertions(+), 62 deletions(-) -- 2.13.6

...i. --- daemon/md.c | 24 ++++++++++++------------ generator/generator_actions.ml | 4 ++-- regressions/test-list-filesystems.sh | 2 +- regressions/test-list-md-devices.sh | 2 +- regressions/test-mdadm.sh | 26 +++++++++++++------------- src/inspect_fs_unix.c | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/daemon/md.c b/daemon/md.c index 82ddb82..8e4ff88 100644 --- a/daemon/md.c +++ b/daemon/md.c @@ -50,9 +50,9 @@ count_bits (uint64_t bitmap) /* Takes optional arguments, consult optargs_bitmask. */ int...

...m 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 | 9 ++--- daemon/utils.ml | 16 ++++++++ daemon/utils.mli | 11 ++++++ 4 files changed, 67 insertions(+), 62 deletions(-) -- 2.13.6

This series fixes inspection in the case that fstab contains references to md devices. I've made a few changes since the previous posting, which I've summarised below. [PATCH 1/8] build: Create an MD variant of the dummy Fedora image I've double checked that no timestamp is required in the Makefile. The script will not run a second time to build fedora-md2.img. [PATCH 2/8] build:

This is a NFC on its own, but provides a place-holder for drive metadata which can be used after launch. --- src/guestfs-internal.h | 17 +++++++- src/guestfs.c | 20 +++++++++ src/launch.c | 104 +++++++++++++++++++++++++++--------------------- src/virt.c | 4 +- 4 files changed, 96 insertions(+), 49 deletions(-) -------------- next part -------------- A

Read the information from os-release, and make it behave like a Debian distribution (i.e. using dpkg, and apt). --- daemon/inspect_fs.ml | 2 ++ daemon/inspect_fs_unix.ml | 1 + daemon/inspect_types.ml | 2 ++ daemon/inspect_types.mli | 1 + generator/actions_inspection.ml | 4 ++++ 5 files changed, 10 insertions(+) diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml index 2db218bb2..383e3e0a7 100644 --- a/daemon/inspect_fs.ml +++ b/dae...

...ranslation of the C inspection code. --- daemon/Makefile.am | 8 + daemon/inspect.ml | 396 +++++++++++++++++++++ daemon/inspect.mli | 41 +++ daemon/inspect_fs.ml | 363 +++++++++++++++++++ daemon/inspect_fs.mli | 23 ++ daemon/inspect_fs_unix.ml | 745 +++++++++++++++++++++++++++++++++++++++ daemon/inspect_fs_unix.mli | 44 +++ daemon/inspect_fs_unix_fstab.ml | 533 ++++++++++++++++++++++++++++ daemon/inspect_fs_unix_fstab.mli | 34 ++ 9 files changed, 2187 insertions(+) diff --git a/daemon/Makefile.am b/daemon/Makefile...