similar to: [PATCH] v2v: linux: improve regex for resume= entries (RHBZ#1651987)

On Wed, Dec 05, 2018 at 12:57:19PM +0100, Pino Toscano wrote: > Add few more characters for the devices of resume= entries in the > command line of grub: this way it is possible to match also /dev/mapper > devices. > > This should require no further processing, since the names of the > /dev/mapper devices do not change after the conversion. Yes this is what worried me, but I

When updating the device names to the new names, handle GRUB_CMDLINE entries (typically in grub2 configuration files) correctly: loop over the whole configuration value, and replace each occurrency of resume=/dev/device found. The actual code is moved away from replace_if_device, since this function now does only the actual replacement of the device string. --- v2v/convert_linux.ml | 38

v1 was here: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html This is a more complete evolution of the earlier patch. It replaces most important uses of Str with PCRE throughout the code. It also extends the bindings with some useful features like case-insensitive regexps. The main places I *didn't* touch are the generator (GObject uses Str extensively); and

v1: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html v2: https://www.redhat.com/archives/libguestfs/2017-September/msg00158.html v3 is almost identical to v2, but I have added 4 extra commits to almost finish the job of replacing Str everywhere possible (note it's not possible to replace Str in common/mlstdutils or the generator because those are pure OCaml). As

From: "Richard W.M. Jones" <rjones at redhat.com> When injecting a block VirtIO driver during conversion, we rely on the predefined list of names of such drivers. Order in this list denotes the priority (see common/mlcustomize/inject_virtio_win.ml). This commit introduces the "block_driver" convert option, setting its value to the default Virtio_blk and making sure

From: "Richard W.M. Jones" <rjones at redhat.com> When injecting a block VirtIO driver during conversion, we rely on the predefined list of names of such drivers. Order in this list denotes the priority (see common/mlcustomize/inject_virtio_win.ml). This commit introduces the "block_driver" convert option, setting its value to the default Virtio_blk and making sure

Tabs should not be doubly-escaped in regexp. Signed-off-by: Shahar Lev <shahar@stratoscale.com> --- v2v/convert_linux.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index adbcaa2..1e9e689 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -581,7 +581,7 @@ let rec convert ~keep_serial_console (g : G.guestfs)

Do not print warning for 'sr' devices when converting fstab. Not all systems create the /dev/cdrom symlink for SCSI CD-ROM devices. Moreover, on systems with multiple CD-ROMs, having entries for /dev/sr* devices may be inevitable. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/convert_linux.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Iterate on the array directly, instead of converting it to a list to do the same; also, avoid a temporary variable for it. --- v2v/convert_linux.ml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index f9aa334..9941750 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -85,9 +85,7 @@ let rec convert

mkinitrd in SLE guests < 12 tries to get the root device by scanning the fstab: this will fail, since v2v already remapped the devices from hd*/sd* to vd* in the guest (including in its fstab). Since we know what is the root device in the appliance, pass it to mkinitrd directly, so it does not have to do guesswork. Thanks to: Cédric Bosdonnat, for reporting the issue, and testing the fix. ---

From: Pino Toscano <ptoscano at redhat.com> Complementary fix of commit 2d25872df3619a3077006ad0f91c029602db6780. On SLES 11 SP4 with kdump enabled mkinitrd calls mkdumprd which calls mkinitrd, but mkdumprd doesn't have any clue of the root device. Call mkinitrd with rootdev environment variable to tell them all what device to use as root. Tested-By: C?dric Bosdonnat <cbosdonnat at

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/convert_linux.ml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index

From: Tomáš Golembiovský <tgolembi@redhat.com> Do not print warning for 'sr' devices when converting fstab. Not all systems create the /dev/cdrom symlink for SCSI CD-ROM devices. Moreover, on systems with multiple CD-ROMs, having entries for /dev/sr* devices may be inevitable. RWMJ: Use String.is_prefix instead of String.find, to more accurately match on the device name.

On Mon, 8 Aug 2016 18:38:55 +0200 Pino Toscano <ptoscano@redhat.com> wrote: > Use the canonical way to regenerate the initrd images for all the > installed kernels, i.e. reconfigure the initramfs-tools which will > trigger the kernel postinst scripts. > --- > v2v/convert_linux.ml | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git

Using update-initramfs is the native way of updating initrd on Debian based systems. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/convert_linux.ml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 08f4b2a..b09d03e 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -478,6 +478,15 @@

--- v2v/convert_linux.ml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index f670812..39a520c 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -49,13 +49,14 @@ type kernel_info = { ki_modules : string list; (* The list of module names. *) ki_supports_virtio : bool; (* Kernel has

Just code motion. --- v2v/convert_linux.ml | 68 +++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.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 =

Using update-initramfs is the native way of updating initrd on Debian based systems. To add some modules to the image we can list them in file /etc/initramfs-tools/modules. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/convert_linux.ml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index

On Fri, Aug 26, 2016 at 11:02:07AM +0200, Pino Toscano wrote: > When checking whether a kernel supports virtio or it is Xen-based, it is > assumed that the feature has the kernel module for it; this will fail if > the feature is built-in in the kernel, misrepresenting it. > > The solution is to check the kernel configuration (/boot/config-$kver) > whether the feature is

The replacement string was wrong. There are only two match groups in the regular expression, not three. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/convert_linux.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 06943cd..4b1ce99 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@