Rebase me: use is_infix directly

Signed-off-by: Benjamin Reis <benjamin.reis@vates.tech>
xapi-project · May 14, 2024 · 9746d6d · 9746d6d
1 parent 978b260
commit 9746d6d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/ocaml/xapi/xapi_vm.ml b/ocaml/xapi/xapi_vm.ml
@@ -1651,13 +1651,14 @@ let get_secureboot_readiness ~__context ~self =
               Helpers.call_script !Xapi_globs.varstore_ls
                 [Db.VM.get_uuid ~__context ~self]
             in
-            let contains str substr =
-              Astring.String.is_infix ~affix:substr str
+            let pk_present = Astring.String.is_infix ~affix:"PK" varstore_ls in
+            let kek_present =
+              Astring.String.is_infix ~affix:"KEK" varstore_ls
+            in
+            let db_present = Astring.String.is_infix ~affix:"db" varstore_ls in
+            let dbx_present =
+              Astring.String.is_infix ~affix:"dbx" varstore_ls
             in
-            let pk_present = contains varstore_ls "PK" in
-            let kek_present = contains varstore_ls "KEK" in
-            let db_present = contains varstore_ls "db" in
-            let dbx_present = contains varstore_ls "dbx" in
             match (pk_present, kek_present, db_present, dbx_present) with
             | true, true, true, true ->
                 `ready