File tree 5 files changed +16
-5
lines changed
5 files changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -2020,6 +2020,11 @@ let t =
2020
2020
, " 22.16.0"
2021
2021
, " Became StaticRO to be editable through new method"
2022
2022
)
2023
+ ; ( Changed
2024
+ , " 25.12.0"
2025
+ , " Field replaced with a digest. You can still get the actual \
2026
+ value by calling Host.get_uefi_certificates"
2027
+ )
2023
2028
]
2024
2029
~default_value: (Some (VString " " )) " uefi_certificates"
2025
2030
" The UEFI certificates allowing Secure Boot"
Original file line number Diff line number Diff line change @@ -613,8 +613,8 @@ module Version = struct
613
613
try Scanf. sscanf name " %d.%d.%d%s" of_chunks
614
614
with _ ->
615
615
failwith
616
- (Printf. sprintf " Version schema changed, please change this code %s"
617
- __LOC__
616
+ (Printf. sprintf " Version schema changed, please change this code %s: %s "
617
+ name __LOC__
618
618
)
619
619
620
620
let to_name_date (lst , str ) =
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ let hash x = Digest.string x |> Digest.to_hex
3
3
(* BEWARE: if this changes, check that schema has been bumped accordingly in
4
4
ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)
5
5
6
- let last_known_schema_hash = " ad67a64cd47cdea32085518c1fb38d27 "
6
+ let last_known_schema_hash = " 55f3fcbdb67344ba627fc1dec38fe232 "
7
7
8
8
let current_schema_hash : string =
9
9
let open Datamodel_types in
Original file line number Diff line number Diff line change @@ -2127,7 +2127,8 @@ let get_active_uefi_certificates ~__context ~self =
2127
2127
in
2128
2128
match (! Xapi_globs. allow_custom_uefi_certs, custom_uefi_certs) with
2129
2129
| false , _ | true , "" ->
2130
- Db.Pool. get_uefi_certificates ~__context ~self
2130
+ let master = Db.Pool. get_master ~__context ~self in
2131
+ Db.Host. get_uefi_certificates ~__context ~self: master
2131
2132
| true , _ ->
2132
2133
custom_uefi_certs
2133
2134
Original file line number Diff line number Diff line change @@ -2757,7 +2757,12 @@ let write_uefi_certificates_to_disk ~__context ~host =
2757
2757
if Pool_role. is_master () then
2758
2758
Db.Pool. set_uefi_certificates ~__context
2759
2759
~self: (Helpers. get_pool ~__context)
2760
- ~value: disk_uefi_certs_tar ;
2760
+ ~value:
2761
+ ( if disk_uefi_certs_tar = " " then
2762
+ " "
2763
+ else
2764
+ Digest. string disk_uefi_certs_tar |> Digest. to_hex
2765
+ ) ;
2761
2766
let pool_uefi_certs =
2762
2767
Db.Pool. get_custom_uefi_certificates ~__context
2763
2768
~self: (Helpers. get_pool ~__context)
You can’t perform that action at this time.
0 commit comments