search for: grub1

...> 1 file changed, 55 insertions(+), 31 deletions(-) > > diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml > index cad72a829..593797f4e 100644 > --- a/v2v/linux_bootloaders.ml > +++ b/v2v/linux_bootloaders.ml > @@ -42,6 +42,10 @@ type bootloader_type = > | Grub1 > | Grub2 > > +let string_of_bootloader_type = function > + | Grub1 -> "Grub1" > + | Grub2 -> "Grub2" > + > (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) > let remove_hd_prefix path = > let rex = Str.regexp "...

...gt; >> > >>diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml > >>index cad72a829..593797f4e 100644 > >>--- a/v2v/linux_bootloaders.ml > >>+++ b/v2v/linux_bootloaders.ml > >>@@ -42,6 +42,10 @@ type bootloader_type = > >> | Grub1 > >> | Grub2 > >> > >>+let string_of_bootloader_type = function > >>+ | Grub1 -> "Grub1" > >>+ | Grub2 -> "Grub2" > >>+ > >> (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) > >&gt...

...+++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 31 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index e03d22b..9160dcc 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -42,6 +42,10 @@ type bootloader_type = | Grub1 | Grub2 +let string_of_bootloader_type = function + | Grub1 -> "Grub1" + | Grub2 -> "Grub2" + (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) let remove_hd_prefix path = let rex = Str.regexp "^(hd.*)\\(.*\\)" in @@ -49,6 +53,10 @@ l...

...++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index e03d22b..0c236e1 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -49,6 +49,14 @@ let remove_hd_prefix path = (* Grub1 (AKA grub-legacy) representation. *) class bootloader_grub1 (g : G.guestfs) inspect grub_config = + (* We expect Augeas to parse the grub_config file. However + * the upstream lens only lists a subset of the possible + * locations for this file. Therefore tell Augeas that + * grub_config...

...+++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 31 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index e03d22b..9160dcc 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -42,6 +42,10 @@ type bootloader_type = | Grub1 | Grub2 +let string_of_bootloader_type = function + | Grub1 -> "Grub1" + | Grub2 -> "Grub2" + (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) let remove_hd_prefix path = let rex = Str.regexp "^(hd.*)\\(.*\\)" in @@ -49,6 +53,10 @@ l...

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

Create an object hierarchy to represent different bootloaders for Linux guests, moving the separate handling of grub1 and grub2 in different classes: this isolates the code for each type of bootloader together, instead of scattering it all around. This is mostly code refactoring, with no actual behaviour change. --- po/POTFILES-ml | 1 + v2v/Makefile.am | 2 + v2v/bootloaders.ml | 317 ++++++++++...

On Monday, 15 August 2016 16:26:51 CEST Richard W.M. Jones wrote: > On Mon, Aug 15, 2016 at 04:48:29PM +0200, Pino Toscano wrote: > > Create an object hierarchy to represent different bootloaders for Linux > > guests, moving the separate handling of grub1 and grub2 in different > > classes: this isolates the code for each type of bootloader together, > > instead of scattering it all around. > > > > This is mostly code refactoring, with no actual behaviour change. > > --- > > po/POTFILES-ml | 1 + > &gt...

...file changed, 47 insertions(+), 31 deletions(-) > > diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml > index e03d22b..0c236e1 100644 > --- a/v2v/linux_bootloaders.ml > +++ b/v2v/linux_bootloaders.ml > @@ -49,6 +49,14 @@ let remove_hd_prefix path = > > (* Grub1 (AKA grub-legacy) representation. *) > class bootloader_grub1 (g : G.guestfs) inspect grub_config = > + (* We expect Augeas to parse the grub_config file. However > + * the upstream lens only lists a subset of the possible > + * locations for this file. Therefore tell Augeas tha...

...gt; @@ -335,32 +335,44 @@ end > > 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/grub/grub.conf", Grub1; > + let grub_configs = [ > + "grub.cfg", Grub2; > + "grub.conf", Grub1; > + "menu.lst", Grub1; > ] in > - let locations = > + > + let boot_location = >...

...+++++++++++++++------------------ 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index cad72a829..33a6dc4e9 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -49,6 +49,13 @@ let remove_hd_prefix path = (* Grub1 (AKA grub-legacy) representation. *) class bootloader_grub1 (g : G.guestfs) inspect grub_config = + let () = + (* Apply the "grub" lens if it is not handling the file + * already -- Augeas < 1.7.0 will error out otherwise. + *) + if g#aug_ls ("/files" ^ grub_config) =...

On Mon, Aug 15, 2016 at 04:48:29PM +0200, Pino Toscano wrote: > Create an object hierarchy to represent different bootloaders for Linux > guests, moving the separate handling of grub1 and grub2 in different > classes: this isolates the code for each type of bootloader together, > instead of scattering it all around. > > This is mostly code refactoring, with no actual behaviour change. > --- > po/POTFILES-ml | 1 + > v2v/Makefile.am | 2 + &gt...

Create an object hierarchy to represent different bootloaders for Linux guests, moving the separate handling of grub1 and grub2 in different classes: this isolates the code for each type of bootloader together, instead of scattering it all around. This is mostly code refactoring, with no actual behaviour change. --- po/POTFILES-ml | 1 + v2v/Makefile.am | 2 + v2v/convert_linux.ml |...

Create an object hierarchy to represent different bootloaders for Linux guests, moving the separate handling of grub1 and grub2 in different classes. This will allow us to support more bootloaders in the future. This is mostly code refactoring, with no actual behaviour change. --- po/POTFILES-ml | 1 + v2v/Makefile.am | 2 + v2v/bootloaders.ml | 317 +++++++++++++++++++++++++++++++++++++++++++++...

Moving to public discussion... This was found with Xen hypervisor version supporting device unplugging and the domU kernel having net-/blkfront and pci platform built-in (or as module). The block device is defined as hda and the NIC type=ioemu (so theoretically guests without pv support would work, too). Since both drivers are present, the kernel tries to unplug the emulated devices and

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.

Hi. I''m trying to run Xen 4.0.1 with Debian Squeeze in Dom0 My grub config: menuentry ''Debian GNU/Linux, with Linux 2.6.32-5-xen-amd64 and XEN 4.0-amd64'' --class debian --class gnu-linux --class gnu --class os --class xen { insmod part_msdos insmod ext2 set root=''(hd0,msdos1)'' search --no-floppy --fs-uuid --set e719719a-35aa-4ada-8ab5-9b6c676bc89e

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

...) took 0.00 seconds^M libguestfs: trace: is_file = 0 libguestfs: trace: is_file "/boot/grub/grub.conf" "followsymlinks:true" guestfsd: main_loop: new request, len 0x44^M guestfsd: main_loop: proc 37 (is_file) took 0.00 seconds^M libguestfs: trace: is_file = 0 virt-v2v: error: no grub1/grub-legacy or grub2 configuration file was found --- Kevin C

...ssed, and 9394176 bytes long uncompressed. The box in question has 8GiB of RAM. 1) I have tried this with memdisk from syslinux 4.02, 4.05, and 6.03. Same failure each time. 2) Changing the level of compression (i.e. gzip -1 instead of gzip -9) does not make it work. 3) Doing the same thing with grub1 (version 0.97), but using the same image and same version of memdisk, *does* work. 4) Uncompressing the ISO *does* make it work. Any suggestions on where to look next? David