Displaying 2 results from an estimated 2 matches for "e7d440c29".
2018 Feb 07
1
[PATCH] customize: avoid Array.mem for now
...h is higher than our
requirement, add a simple reimplementation of it.
Fixes commit 719d68fa247cc3885ecf7ec1c010faf83267d786.
---
customize/SELinux_relabel.ml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/customize/SELinux_relabel.ml b/customize/SELinux_relabel.ml
index e7d440c29..7cc166edb 100644
--- a/customize/SELinux_relabel.ml
+++ b/customize/SELinux_relabel.ml
@@ -24,6 +24,10 @@ open Printf
module G = Guestfs
+(* Simple reimplementation of Array.mem, available only with OCaml >= 40.3. *)
+let array_find a l =
+ List.mem a (Array.to_list l)
+
let relabel (g :...
2018 Jan 31
1
[PATCH] customize: allow missing SELINUXTYPE in SELinux config
...test-virt-customize-docs.sh \
@@ -225,6 +226,7 @@ check-valgrind:
SLOW_TESTS = \
$(firstboot_test_scripts) \
$(password_test_scripts) \
+ test-selinuxrelabel.sh \
$(settings_test_scripts)
check-slow:
diff --git a/customize/SELinux_relabel.ml b/customize/SELinux_relabel.ml
index d404c35fa..e7d440c29 100644
--- a/customize/SELinux_relabel.ml
+++ b/customize/SELinux_relabel.ml
@@ -37,8 +37,18 @@ let relabel (g : G.guestfs) =
g#aug_load ();
debug_augeas_errors g;
- (* Get the SELinux policy name, eg. "targeted", "minimum". *)
- let policy = g#aug_get...