search for: i_bio

...> + > + 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, _) -> g#is_file ~followsymlinks:true config_file > - ) locations > - with > - Not_found -> > - error (f_"no bootloader detected") in > + | I_BIOS -> &...

...;/grub.cfg" then + Some Grub2 + else if String.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; - "/...

Thanks, I pushed both patches. Note you will get conflicts when you pull, since I have folded in some fixes, largely cosmetic, 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 -> > +...

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

..."/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 config_file - ) locations - with - Not_found -> - error (f_"no bootloader detected") in - - match typ with - | Grub1 -> - if config_file = &quo...

...f path '/' with | Some "grub.cfg" -> 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 loc...

...; - ] 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 config_file > - ) locations > - with > - Not_found -> > - error (f_"no bootloader detected") in > - > - match typ wit...

..."/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 config_file - ) locations - with - Not_found -> - error (f_"no bootloader detected") in - - match typ with - | Grub1 -> - if config_file = &quo...

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

...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 config_file > >>- ) locations > >>- with > >>- Not_found -> > >>- error (f_"no bo...

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

..."/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 config_file - ) locations - with - Not_found -> - error (f_"no bootloader detected") in - - match typ with - | Grub1 -> - if config_file = &quo...

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

...ct.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 List.find ( @@ -111,6 +115,11 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = match grub with | `Grub2 -> "" | `Grub1 -> + if grub_config = "/boot/efi/EFI/redhat/grub.conf" then ( +...

...M +0300, Pavel Butsykin wrote: > 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 onl...

...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...

Augeas 1.7.0 was released a couple of days ago. By encouraging everyone to upgrade to this we can drop several calls to aug_transform and also our custom copies of two lenses, and a lot of related code. Rich.

...quot;/boot/grub2/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) :: locations + | I_BIOS -> locations in + try + List.find ( + fun (grub_config, _) -> g#is_file ~followsymlinks:true grub_config + ) locations + with + Not_found -> + error (f_"no bootloader detected") in + + match typ with + | Grub1 -> new bootloader_grub1 g ins...

...ub2; > + "/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) :: locations > + | I_BIOS -> locations in > + try > + List.find ( > + fun (grub_config, _) -> g#is_file ~followsymlinks:true grub_config > + ) locations > + with > + Not_found -> > + error (f_"no bootloader detected") in > + > + match typ wit...

A very miscellaneous set of cleanups to how we handle the Windows registry in virt-v2v, firstboot, and inspection code. This should all be straightforward non-controversial refactoring. Some highlights: - Add a new mllib Registry module containing various utility functions that are currently scattered all around. - Only compute the software/system hive paths once during inspection, and