search for: i_uefi

...d6..2de5e42 100644 > --- a/v2v/convert_linux.ml > +++ b/v2v/convert_linux.ml > @@ -97,7 +97,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = > "/boot/grub/grub.conf", `Grub1; > ] in > let locations = > - if inspect.i_uefi then > + if inspect.i_uefi <> None then > ("/boot/efi/EFI/redhat/grub.cfg", `Grub2) :: locations > else > locations in > diff --git a/v2v/inspect_source.ml b/v2v/inspect_source.ml > index 65dcb88..7a7674a 100644 > --- a/v2v/inspect_...

I'm going to push this because it's a test blocker, but FYI. Rich.

...(); - (* Does the guest require UEFI on the target? *) - message (f_"Checking if the guest needs BIOS or UEFI to boot"); - let target_firmware = - match source.s_firmware with - | BIOS -> TargetBIOS - | UEFI -> TargetUEFI - | UnknownFirmware -> - if inspect.i_uefi then TargetUEFI else TargetBIOS in - let supported_firmware = output#supported_firmware in - if not (List.mem target_firmware supported_firmware) then - error (f_"this guest cannot run on the target, because the target does not support %s firmware (supported firmware on target: %s)")...

Expose the aug_transform API through the library, so it's possible to add/remove Augeas transformations to handle files in custom places using existing lenses. --- daemon/augeas.c | 21 +++++++++++++++++++++ generator/actions.ml | 12 ++++++++++++ gobject/Makefile.inc | 2 ++ src/MAX_PROC_NR | 2 +- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/daemon/augeas.c

...osmetic, but there were two more important ones: (1) v2v_unit_tests: BIOS -> I_BIOS. Please run the tests! (2) The code below > + let esp_temp_path = g#mkdtemp "/Windows/Temp/ESP_XXXXXX" in > + > + match inspect.i_firmware with > + | I_BIOS -> () > + | I_UEFI esp_list -> > + List.iter ( > + fun dev_path -> > + g#mount dev_path esp_temp_path; > + fix_win_uefi_bcd esp_temp_path; > + g#umount esp_temp_path; > + ) esp_list; > + > + g#rmdir esp_temp_path; doesn't do what you think....

...t;, Grub1; > + let grub_configs = [ > + "grub.cfg", Grub2; > + "grub.conf", Grub1; > + "menu.lst", Grub1; > ] in > - let locations = > + > + let boot_location = > match inspect.i_firmware with > - | I_UEFI _ -> > - [ > - "/boot/efi/EFI/redhat/grub.cfg", Grub2; > - "/boot/efi/EFI/redhat/grub.conf", Grub1; > - ] @ locations > - | I_BIOS -> locations in > - try > - List.find ( > - fun (config_file, _) -...

...ng.is_suffix path "/grub.conf" || + String.is_suffix path "/menu.lst" then + Some Grub1 + else + None + +(* Where to start searching for bootloaders. *) +let bootloader_mountpoint = function + | { i_firmware = I_BIOS } -> "/boot" + | { i_firmware = I_UEFI _ } -> "/boot/efi/EFI" + let detect_bootloader (g : G.guestfs) inspect = - let config_file, typ = - let locations = [ - "/boot/grub2/grub.cfg", Grub2; - "/boot/grub/grub.cfg", Grub2; - "/boot/grub/menu.lst", Grub1; - "/boot/gr...

...put = + (* Does the guest require UEFI on the target? *) + message (f_"Checking if the guest needs BIOS or UEFI to boot"); + let target_firmware = + match source.s_firmware with + | BIOS -> TargetBIOS + | UEFI -> TargetUEFI + | UnknownFirmware -> + if inspect.i_uefi then TargetUEFI else TargetBIOS in + let supported_firmware = output#supported_firmware in + if not (List.mem target_firmware supported_firmware) then + error (f_"this guest cannot run on the target, because the target does not support %s firmware (supported firmware on target: %s)")...

...v2v/convert_linux.ml b/v2v/convert_linux.ml index 9941750..2a53315 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -96,7 +96,11 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = ] in let locations = match inspect.i_firmware with - | I_UEFI _ -> ("/boot/efi/EFI/redhat/grub.cfg", `Grub2) :: locations + | I_UEFI _ -> + [ + "/boot/efi/EFI/redhat/grub.cfg", `Grub2; + "/boot/efi/EFI/redhat/grub.conf", `Grub1; + ] @ locations | I_BIOS -> locations in try...

...le, typ = - let locations = [ - "/boot/grub2/grub.cfg", Grub2; - "/boot/grub/grub.cfg", Grub2; - "/boot/grub/menu.lst", Grub1; - "/boot/grub/grub.conf", Grub1; - ] in - let locations = - match inspect.i_firmware with - | I_UEFI _ -> - [ - "/boot/efi/EFI/redhat/grub.cfg", Grub2; - "/boot/efi/EFI/redhat/grub.conf", Grub1; - ] @ locations - | I_BIOS -> locations in - try - List.find ( - fun (config_file, _) -> g#is_file ~followsymlinks:true conf...

...() = @@ -60,6 +170,16 @@ class bootloader_grub1 (g : G.guestfs) inspect grub_config = fun path -> List.mem_assoc path mounts ) [ "/boot/grub"; "/boot" ] with Not_found -> "" in + + let uefi_active = + match inspect.i_firmware with + | I_UEFI _ -> true + | _ -> false in + + let arch = inspect.i_arch in + let distro = inspect.i_distro in + let distro_ver_major = inspect.i_major_version in + object inherit bootloader @@ -184,6 +304,12 @@ object loop paths; g#aug_save () + + method fix_efi_boot () = + if u...

...gt; Some Grub2 | Some ("grub.conf"|"menu.lst") -> Some Grub1 | Some _ | None -> None > +(* Where to start searching for bootloaders. *) > +let bootloader_mountpoint = function > + | { i_firmware = I_BIOS } -> "/boot" > + | { i_firmware = I_UEFI _ } -> "/boot/efi/EFI" It seems to be used only once, so I'd just put it inline below (it's small to read). > + > let detect_bootloader (g : G.guestfs) inspect = > - let config_file, typ = > - let locations = [ > - "/boot/grub2/grub.cfg", Gr...

..."/boot/grub2/grub.cfg", Grub2; > - "/boot/grub/grub.cfg", Grub2; > - "/boot/grub/menu.lst", Grub1; > - "/boot/grub/grub.conf", Grub1; > - ] in > - let locations = > - match inspect.i_firmware with > - | I_UEFI _ -> > - [ > - "/boot/efi/EFI/redhat/grub.cfg", Grub2; > - "/boot/efi/EFI/redhat/grub.conf", Grub1; > - ] @ locations > - | I_BIOS -> locations in > - try > - List.find ( > - fun (config_file, _) -...

...le, typ = - let locations = [ - "/boot/grub2/grub.cfg", Grub2; - "/boot/grub/grub.cfg", Grub2; - "/boot/grub/menu.lst", Grub1; - "/boot/grub/grub.conf", Grub1; - ] in - let locations = - match inspect.i_firmware with - | I_UEFI _ -> - [ - "/boot/efi/EFI/redhat/grub.cfg", Grub2; - "/boot/efi/EFI/redhat/grub.conf", Grub1; - ] @ locations - | I_BIOS -> locations in - try - List.find ( - fun (config_file, _) -> g#is_file ~followsymlinks:true conf...

...gt;- "/boot/grub/grub.cfg", Grub2; > >>- "/boot/grub/menu.lst", Grub1; > >>- "/boot/grub/grub.conf", Grub1; > >>- ] in > >>- let locations = > >>- match inspect.i_firmware with > >>- | I_UEFI _ -> > >>- [ > >>- "/boot/efi/EFI/redhat/grub.cfg", Grub2; > >>- "/boot/efi/EFI/redhat/grub.conf", Grub1; > >>- ] @ locations > >>- | I_BIOS -> locations in > >>- try > >&gt...

This patch is just for discussion. There are still a couple of issues that I'm trying to fix. One is that all of the test guests I have, even ones with static IPs, have multiple interfaces, some using DHCP, so the conditions for adding the Powershell script don't kick in. This makes testing very awkward. However a bigger issue is that I think the premise is wrong. In some registries

...le, typ = - let locations = [ - "/boot/grub2/grub.cfg", Grub2; - "/boot/grub/grub.cfg", Grub2; - "/boot/grub/menu.lst", Grub1; - "/boot/grub/grub.conf", Grub1; - ] in - let locations = - match inspect.i_firmware with - | I_UEFI _ -> - [ - "/boot/efi/EFI/redhat/grub.cfg", Grub2; - "/boot/efi/EFI/redhat/grub.conf", Grub1; - ] @ locations - | I_BIOS -> locations in - try - List.find ( - fun (config_file, _) -> g#is_file ~followsymlinks:true conf...

v1 was here with much discussion: https://www.redhat.com/archives/libguestfs/2018-December/msg00048.html v2: - Fix the case where there are multiple interfaces. Note this does not preserve order correctly (see patch for comment on why that is a hard problem). - Preserve name servers. This patch is still for discussion only. I'd like to see what might be done to get this upstream

...e: > match typ with > | Grub1 -> > - if config_file = "/boot/efi/EFI/redhat/grub.conf" then > - g#aug_transform "grub" "/boot/efi/EFI/redhat/grub.conf"; > - > + (match inspect.i_firmware with > + | I_BIOS -> () > + | I_UEFI _ -> g#aug_transform "grub" config_file > + ); > new bootloader_grub1 g inspect config_file > | Grub2 -> new bootloader_grub2 g config_file I don't think this part of the patch is correct. We need to use the Augeas transform only for a particular path which...

...> >>- if config_file = "/boot/efi/EFI/redhat/grub.conf" then > >>- g#aug_transform "grub" "/boot/efi/EFI/redhat/grub.conf"; > >>- > >>+ (match inspect.i_firmware with > >>+ | I_BIOS -> () > >>+ | I_UEFI _ -> g#aug_transform "grub" config_file > >>+ ); > >> new bootloader_grub1 g inspect config_file > >> | Grub2 -> new bootloader_grub2 g config_file > > > >I don't think this part of the patch is correct. We need to use the >...