From ea49d75d0dd7ef05614f21f575fb27371f60782f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 27 Mar 2018 10:58:23 +0100 Subject: [PATCH] v2v: Add osinfo to internal inspection struct. This makes it available to output modes when creating metadata. --- v2v/inspect_source.ml | 1 + v2v/types.ml | 3 +++ v2v/types.mli | 1 + 3 files changed, 5 insertions(+) diff --git a/v2v/inspect_source.ml b/v2v/inspect_source.ml index 68e1c90aa..bd382cb11 100644 --- a/v2v/inspect_source.ml +++ b/v2v/inspect_source.ml @@ -85,6 +85,7 @@ let rec inspect_source root_choice g = i_root = root; i_type = typ; i_distro = g#inspect_get_distro root; + i_osinfo = g#inspect_get_osinfo root; i_arch = g#inspect_get_arch root; i_major_version = g#inspect_get_major_version root; i_minor_version = g#inspect_get_minor_version root; diff --git a/v2v/types.ml b/v2v/types.ml index 8c1a069e3..789ae69b9 100644 --- a/v2v/types.ml +++ b/v2v/types.ml @@ -328,6 +328,7 @@ type inspect = { i_root : string; i_type : string; i_distro : string; + i_osinfo : string; i_arch : string; i_major_version : int; i_minor_version : int; @@ -350,6 +351,7 @@ let string_of_inspect inspect = i_root = %s i_type = %s i_distro = %s +i_osinfo = %s i_arch = %s i_major_version = %d i_minor_version = %d @@ -365,6 +367,7 @@ i_windows_current_control_set = %s " inspect.i_root inspect.i_type inspect.i_distro + inspect.i_osinfo inspect.i_arch inspect.i_major_version inspect.i_minor_version diff --git a/v2v/types.mli b/v2v/types.mli index c5f99a16b..fa2b402b4 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -306,6 +306,7 @@ type inspect = { i_root : string; (** Root device. *) i_type : string; (** Usual inspection fields. *) i_distro : string; + i_osinfo : string; i_arch : string; i_major_version : int; i_minor_version : int;