search for: linux_bootload

On Debian-based systems, Grub2 is in /boot/grub (as already known after commit 03b9f2b967c4c61a5acda6a3802317be109d213e), so make sure device.map is changed even in this situation. --- v2v/linux_bootloaders.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index 6582970..061d945 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -266,6 +266,7 @@ object (self) "/files/etc/default/grub/GRUB_CMDLINE_LINUX";...

When using grubby to get the default kernel of a guest, do not fail with a bogus error like: virt-v2v: error: libguestfs error: statns: statns_stub: path must start with a / character in case there is no default kernel that can be determined (e.g. because of a bogus configuration). --- v2v/linux_bootloaders.ml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index 8de3f0469..b820f731f 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -239,7 +239,10 @@ object (self) let res = match get_de...

On Debian family of OSes Grub2 tools are prefixed with 'grub-', not with 'grub2-'. We have to detect the correct name of the tool to use it. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/linux_bootloaders.ml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index a5e4c8d..4f53f87 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -186,6 +186,19 @@ end (* Grub2 representation. *) class...

...d to use the method in a callback. In lablgtk2 the convention is to use unitless methods if either: the method shouldn't be used as a callback; or: (conceptually) the method doesn't change the object's internal state. Let's do that here. --- v2v/convert_linux.ml | 2 +- v2v/linux_bootloaders.ml | 14 ++++++-------- v2v/linux_bootloaders.mli | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 7829612..e1a769b 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -240,7 +240,7 @@ let rec convert ~keep_se...

On Debian family of OSes Grub2 tools are prefixed with 'grub-', not with 'grub2-'. We have to detect the correct name of the tool to use it. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/linux_bootloaders.ml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index a5e4c8d..0729f17 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -189,6 +189,22 @@ class bootloader_grub2 (g : G.guestfs)...

v2: Rich, I hope I've done all modifications according to your comments, namely: * moved the code from linux_bootloaders to convert_linux * made minor code modifications --- Not all UEFI guests can survive conversion, because of lost bootloader information in UEFI NVRAM. But some guest can cope with this because they have a fallback bootloader and use UEFI Removable Media Boot Behavior to load (see https://u...

...oader by providing a temporary one. This bootloader is used for the first boot only, then the conversion script restores the initial bootloader settings and removes the temporary loader. Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com> --- v2v/convert_linux.ml | 15 +++++ v2v/linux_bootloaders.ml | 149 ++++++++++++++++++++++++++++++++++++++++++++-- v2v/linux_bootloaders.mli | 2 + 3 files changed, 162 insertions(+), 4 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index e91ae12..77a2555 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -1122,6...

--- v2v/linux_bootloaders.ml | 2 +- v2v/utils.ml | 9 --------- v2v/utils.mli | 3 --- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index a5e4c8d..7c48480 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -...

...only (two) places where such a function is used, but there may be a few more lurking. --- common/mlstdutils/std_utils.ml | 7 +++++++ common/mlstdutils/std_utils.mli | 2 ++ common/mlstdutils/std_utils_tests.ml | 10 ++++++++++ mllib/common_utils.ml | 10 ++-------- v2v/linux_bootloaders.ml | 8 ++------ 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/common/mlstdutils/std_utils.ml b/common/mlstdutils/std_utils.ml index 374507662..b731b8fd5 100644 --- a/common/mlstdutils/std_utils.ml +++ b/common/mlstdutils/std_utils.ml @@ -229,6 +229,13 @@ module S...

...the problem for all distributions, for example Debian does not store grub config on the EFI partition, therefore for such distributions another solution is necessary. Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com> Signed-off-by: Richard W.M. Jones <rjones@redhat.com> --- v2v/linux_bootloaders.ml | 83 ++++++++++++++++++++++++++++++------------------ 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 bootlo...

...the problem for all distributions, for example Debian does not store grub config on the EFI partition, therefore for such distributions another solution is necessary. Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com> Signed-off-by: Richard W.M. Jones <rjones@redhat.com> --- v2v/linux_bootloaders.ml | 78 +++++++++++++++++++++++++++++------------------- 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_...

This is the location of the Grub2 configuration in Debian-based systems. --- v2v/linux_bootloaders.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index d12edf8..74c40c2 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -299,6 +299,7 @@ let detect_bootloader (g : G.guestfs) inspect = let config_file, typ =...

...13:20:47 CEST Tomáš Golembiovský wrote: > On Debian family of OSes Grub2 tools are prefixed with 'grub-', not with > 'grub2-'. We have to detect the correct name of the tool to use it. > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- > v2v/linux_bootloaders.ml | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml > index a5e4c8d..0729f17 100644 > --- a/v2v/linux_bootloaders.ml > +++ b/v2v/linux_bootloaders.ml > @@ -189,6 +189,22 @@ cla...

In SUSE guests, handle the case where Bootloader::Tools::GetDefaultSection () returns undef. Previously this would return an empty string and cause a bogus error in subsequent code: virt-v2v: error: libguestfs error: statns: statns_stub: path must start with a / character --- v2v/linux_bootloaders.ml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index b5ad25508..d76407670 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -287,10 +287,21 @@ object (self) let cmd =...

The old virt-v2v code ignored boot kernels with names like "/boot/vmlinuz-*.rpmsave". The transscribed code did not because the Str module requires ‘|’ to be escaped as ‘\|’. This changes the code to use PCRE and fixes it. --- v2v/linux_bootloaders.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index 210cce762..00cb5cd19 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -319,9 +319,9 @@ object (self) Array.to_list (g#glob_expand &...

...t_kernels and set_default_kernel. Also, add a "no method" option as well: Debian/Ubuntu guests do not have neither grubby nor Perl's Bootloader::Tools, so there is no way to know what is the default kernel, nor to change it. In this case, add a warning about this situation. --- v2v/linux_bootloaders.ml | 61 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index 4f53f87..e03d22b 100644 --- a/v2v/linux_bootloaders.ml +++ b/v2v/linux_bootloaders.ml @@ -184,6 +184,12 @@ object...

...tely this patch does not solve the problem > for all distributions, for example Debian does not store grub config on the EFI > partition, therefore for such distributions another solution is necessary. > > Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com> > --- > v2v/linux_bootloaders.ml | 56 +++++++++++++++++++++++++++++------------------- > 1 file changed, 34 insertions(+), 22 deletions(-) > > diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml > index e03d22b..210c273 100644 > --- a/v2v/linux_bootloaders.ml > +++ b/v2v/linux_bootloaders.ml...

...nted way? should it be renamed to just "linux" then? * surely something else I'm missing Thanks, Pino Toscano (3): v2v: linux kernels: set type of 'g' v2v: linux: check also kernel config for modules v2v: bootloaders: improve detection of Grub2 default method v2v/linux_bootloaders.ml | 61 ++++++++++++++++++++++++++++++++++-------------- v2v/linux_kernels.ml | 22 +++++++++++++++-- 2 files changed, 64 insertions(+), 19 deletions(-) -- 2.7.4

...eaked) * is tweaking the "enterprise-linux" module the correct/wanted way? should it be renamed to just "linux" then? * surely something else I'm missing Changes from v1: - rebased on master - dropped patch #8, will be solved in a different way - adapted patch #4 to the Linux_bootloaders module Thanks, Pino Toscano (7): v2v: refactor Linux.remove v2v: add basic support for the "deb" package manager v2v: linux: identify Debian-based distros as `Debian_family v2v: add /boot/grub/grub.cfg as Grub2 config v2v: linux: check also kernel config for modules v2v:...

...ode 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 | 294 ++--------------------------------------- v2v/linux_bootloaders.ml | 325 ++++++++++++++++++++++++++++++++++++++++++++++ v2v/linux_bootloaders.mli | 44 +++++++ 5 files changed, 385 insertions(+), 281 deletions(-) create mode 100644 v2v/linux_bootloaders.ml create mode 100644 v2v/linux_bootloaders.mli diff --git a/po/POTFILES-ml b/po/POTFILES-ml index b...