builder: templates: Refactor code for using UEFI.

Simple refactoring.
This commit is contained in:
Richard W.M. Jones
2018-09-11 16:16:26 +01:00
parent 00fff03485
commit 613c1782ea

View File

@@ -125,16 +125,16 @@ let rec main () =
(* Some architectures need EFI boot. *)
let tmpefivars =
match os, arch with
| (Fedora _|RHEL _), Aarch64 ->
let vars = Sys.getcwd () // sprintf "%s.vars" tmpname in
unlink_on_exit vars;
let cmd =
sprintf "cp /usr/share/edk2/aarch64/vars-template-pflash.raw %s"
(quote vars) in
if Sys.command cmd <> 0 then exit 1;
Some ("/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw", vars)
| _ -> None in
if needs_uefi os arch then (
let vars = Sys.getcwd () // sprintf "%s.vars" tmpname in
unlink_on_exit vars;
let cmd =
sprintf "cp /usr/share/edk2/aarch64/vars-template-pflash.raw %s"
(quote vars) in
if Sys.command cmd <> 0 then exit 1;
Some ("/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw", vars)
)
else None in
(* Now construct the virt-install command. *)
let vi = make_virt_install_command os arch ks tmpname tmpout tmpefivars
@@ -426,6 +426,14 @@ and is_selinux_os = function
| Debian _ | Ubuntu _
| FreeBSD _ -> false
and needs_uefi os arch =
match os, arch with
| Fedora _, Aarch64
| RHEL _, Aarch64 -> true
| RHEL _, _ | CentOS _, _ | Fedora _, _
| Debian _, _ | Ubuntu _, _
| FreeBSD _, _ -> false
and get_virtual_size_gb os arch = 6
and make_kickstart os arch =