Displaying 2 results from an estimated 2 matches for "ba947c30e".
2017 Oct 16
4
[PATCH 1/3] daemon: add split_key_value_strings helper
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 =
2017 Oct 16
0
[PATCH 3/3] daemon: inspection: discard os-release w/o version
...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.version <- Some (0, 0);
true
+ (* No version detected, so fall back to other ways. *)
+ | { version = None...