search for: augeas_grub_configur

...x.ml index 7bc1dde..3fd58ce 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -78,7 +78,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = (*----------------------------------------------------------------------*) (* Conversion step. *) - let rec augeas_grub_configuration () = + let augeas_grub_configuration () = if bootloader#set_augeas_configuration () then Linux.augeas_reload g @@ -675,6 +675,41 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = and configure_kernel_modules block_type net_type = (* This func...

...ns(+) > > diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml > index e8c64ac1b..a1bafe91a 100644 > --- a/v2v/convert_linux.ml > +++ b/v2v/convert_linux.ml > @@ -81,6 +81,8 @@ let convert (g : G.guestfs) inspect source output rcaps = > let rec do_convert () = > augeas_grub_configuration (); > > + Windows_virtio.install_linux_tools g inspect; > + > unconfigure_xen (); > unconfigure_vbox (); > unconfigure_vmware (); > diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml > index da02b6c4e..223e7661b 100644 > --- a/v2v/windows_...

...| 5 +++++ 3 files changed, 37 insertions(+) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index e8c64ac1b..a1bafe91a 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -81,6 +81,8 @@ let convert (g : G.guestfs) inspect source output rcaps = let rec do_convert () = augeas_grub_configuration (); + Windows_virtio.install_linux_tools g inspect; + unconfigure_xen (); unconfigure_vbox (); unconfigure_vmware (); diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index 91649694d..93b4d643e 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -27,...

...| 4 ++++ 3 files changed, 36 insertions(+) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index e8c64ac1b..a1bafe91a 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -81,6 +81,8 @@ let convert (g : G.guestfs) inspect source output rcaps = let rec do_convert () = augeas_grub_configuration (); + Windows_virtio.install_linux_tools g inspect; + unconfigure_xen (); unconfigure_vbox (); unconfigure_vmware (); diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index da02b6c4e..223e7661b 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -27,...

...| 4 ++++ 3 files changed, 36 insertions(+) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index e8c64ac1b..a1bafe91a 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -81,6 +81,8 @@ let convert (g : G.guestfs) inspect source output rcaps = let rec do_convert () = augeas_grub_configuration (); + Windows_virtio.install_linux_tools g inspect; + unconfigure_xen (); unconfigure_vbox (); unconfigure_vmware (); diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml index da02b6c4e..73717ead7 100644 --- a/v2v/windows_virtio.ml +++ b/v2v/windows_virtio.ml @@ -27,...

In case qemu-guest-agent is already installed in the guest, do not try to install it again from the RHV Tools ISO. Pino Toscano (2): v2v: linux: install linux tools after unconfigurations v2v: linux: do not install qemu-guest-agent if already installed v2v/convert_linux.ml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) -- 2.21.0

...v2v/convert_linux.ml b/v2v/convert_linux.ml > > index e8c64ac1b..a1bafe91a 100644 > > --- a/v2v/convert_linux.ml > > +++ b/v2v/convert_linux.ml > > @@ -81,6 +81,8 @@ let convert (g : G.guestfs) inspect source output rcaps = > > let rec do_convert () = > > augeas_grub_configuration (); > > > > + Windows_virtio.install_linux_tools g inspect; > > + > > unconfigure_xen (); > > unconfigure_vbox (); > > unconfigure_vmware (); > > diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml > > index da02b6c4e.....

This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more attention: - it is "abusing" Winows_virtio code but renaming/refactoring everything to remove "windows" from the name and use "guest tools" seems like a lot of unnecesary

changes in v2: - moved copy_drivers above copy_files - renamed copy_files to copy_from_virtio_win - renamed install to install_local - use rpm instead of yum This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more attention: - it is "abusing"

changes in v5: - simplified expression in copy_drivers - new commit fixing path constructions - indentation fixes changes in v4: - fix call to install_local changes in v2: - moved copy_drivers above copy_files - renamed copy_files to copy_from_virtio_win - renamed install to install_local - use rpm instead of yum This installs packages with QEMU Guest Agent when converting Linux machine. The

changes in v3: - fix call to install_local changes in v2: - moved copy_drivers above copy_files - renamed copy_files to copy_from_virtio_win - renamed install to install_local - use rpm instead of yum This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more

changes in v4: - fix call to install_local changes in v2: - moved copy_drivers above copy_files - renamed copy_files to copy_from_virtio_win - renamed install to install_local - use rpm instead of yum This installs packages with QEMU Guest Agent when converting Linux machine. The packages should be available on guest tools ISO. The patches work "as-is" but probably deserve some more

...0) - ) vmlinuzes in - vmlinuzes in + let vmlinuzes = bootloader#list_kernels () in (* Map these to installed kernels. *) filter_map ( @@ -389,21 +280,8 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = (* Conversion step. *) let rec augeas_grub_configuration () = - match grub with - | `Grub1 -> - (* Ensure Augeas is reading the grub configuration file, and if not - * then add it. - *) - let incls = g#aug_match "/augeas/load/Grub/incl" in - let incls = Array.to_list incls in - let incls_contains_co...

...x file 0) - ) vmlinuzes in - vmlinuzes in + let vmlinuzes = bootloader#list_kernels () in (* Map these to installed kernels. *) filter_map ( @@ -390,21 +280,8 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = (* Conversion step. *) let rec augeas_grub_configuration () = - match grub with - | `Grub1 -> - (* Ensure Augeas is reading the grub configuration file, and if not - * then add it. - *) - let incls = g#aug_match "/augeas/load/Grub/incl" in - let incls = Array.to_list incls in - let incls_contains_co...

...inuzes in > + let vmlinuzes = bootloader#list_kernels () in > > (* Map these to installed kernels. *) > filter_map ( > @@ -389,21 +280,8 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = > (* Conversion step. *) > > let rec augeas_grub_configuration () = > - match grub with > - | `Grub1 -> > - (* Ensure Augeas is reading the grub configuration file, and if not > - * then add it. > - *) > - let incls = g#aug_match "/augeas/load/Grub/incl" in > - let incls = Array.to_list in...

...0) - ) vmlinuzes in - vmlinuzes in + let vmlinuzes = bootloader#list_kernels () in (* Map these to installed kernels. *) filter_map ( @@ -396,21 +279,8 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = (* Conversion step. *) let rec augeas_grub_configuration () = - match grub with - | `Grub1 -> - (* Ensure Augeas is reading the grub configuration file, and if not - * then add it. - *) - let incls = g#aug_match "/augeas/load/Grub/incl" in - let incls = Array.to_list incls in - let incls_contains_co...

v1 -> v2: - Add simple test of the setfiles API. - Use SELinux_relabel module in virt-v2v (instead of touch /.autorelabel). - Small fixes. Rich.