Skip to content

Commit 46572aa

Browse files
committed
Always set pool.ufi_crtificates
They'are also needed to fallback when custom are empty Signed-off-by: Benjamin Reis <benjamin.reis@vates.tech>
1 parent ce56312 commit 46572aa

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

ocaml/xapi/xapi_host.ml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2777,6 +2777,17 @@ let write_uefi_certificates_to_disk ~__context ~host =
27772777
uefi_certs_in_disk |> Array.mem cert |> log_of
27782778
)
27792779
in
2780+
let disk_uefi_certs_tar =
2781+
really_read_uefi_certificates_from_disk ~__context ~host
2782+
!Xapi_globs.default_auth_dir
2783+
in
2784+
(* synchronize both host & pool read-only fields with contents in disk *)
2785+
Db.Host.set_uefi_certificates ~__context ~self:host
2786+
~value:disk_uefi_certs_tar ;
2787+
if Pool_role.is_master () then
2788+
Db.Pool.set_uefi_certificates ~__context
2789+
~self:(Helpers.get_pool ~__context)
2790+
~value:disk_uefi_certs_tar ;
27802791
let pool_uefi_certs =
27812792
Db.Pool.get_custom_uefi_certificates ~__context
27822793
~self:(Helpers.get_pool ~__context)
@@ -2788,17 +2799,6 @@ let write_uefi_certificates_to_disk ~__context ~host =
27882799
~to_path:!Xapi_globs.default_auth_dir
27892800
in
27902801
check_valid_uefi_certs_in path ;
2791-
let disk_uefi_certs_tar =
2792-
really_read_uefi_certificates_from_disk ~__context ~host
2793-
!Xapi_globs.varstore_dir
2794-
in
2795-
(* synchronize both host & pool read-only fields with contents in disk *)
2796-
Db.Host.set_uefi_certificates ~__context ~self:host
2797-
~value:disk_uefi_certs_tar ;
2798-
if Pool_role.is_master () then
2799-
Db.Pool.set_uefi_certificates ~__context
2800-
~self:(Helpers.get_pool ~__context)
2801-
~value:disk_uefi_certs_tar
28022802
| true, "" ->
28032803
(* When overriding certificates and user hasn't been able to set a value
28042804
yet, keep the symlink so VMs always have valid uefi certificates *)

0 commit comments

Comments
 (0)