search for: mkinitrd_kv

...of calling update-initramfs is that we can turn on verbose mode, just like for dracut: let run_update_initramfs_command () = let args = "update-initramfs" :: (if verbose () then [ "-v" ] else []) @ [ "-c"; "-k"; mkinitrd_kv ] in ignore (g#command (Array.of_list args)) in The other advantage is that we can provide the kernel version we want. The default is to update the initramfs for the latest kernel, which in theory might not be the one we want if it were missing virtio drivers (not sure if thi...

...rce rcaps = ignore (g#command (Array.of_list args)) in + let run_update_initramfs_command () = + let args = + "/usr/sbin/update-initramfs" :: + (if verbose () then [ "-v" ] else []) + @ [ "-c"; "-k"; mkinitrd_kv ] + in + ignore (g#command (Array.of_list args)) + in + if g#is_file ~followsymlinks:true "/sbin/dracut" then run_dracut_command "/sbin/dracut" else if g#is_file ~followsymlinks:true "/usr/bin/dracut" then @@ -491,6 +500,18 @@...

...rce rcaps = ignore (g#command (Array.of_list args)) in + let run_update_initramfs_command () = + let args = + "/usr/sbin/update-initramfs" :: + (if verbose () then [ "-v" ] else []) + @ [ "-c"; "-k"; mkinitrd_kv ] + in + ignore (g#command (Array.of_list args)) + in + if g#is_file ~followsymlinks:true "/sbin/dracut" then run_dracut_command "/sbin/dracut" else if g#is_file ~followsymlinks:true "/usr/bin/dracut" then @@ -491,6 +500,30 @@...

...r username then ( changed := true; diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 7967c0f..f5a716f 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -795,13 +795,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = *) let mkinitrd_kv = let modpath = kernel.ki_modpath in - let len = String.length modpath in - try - let i = String.rindex modpath '/' in - String.sub modpath (i+1) (len - (i+1)) - with - Not_found -> - invalid_arg (sprintf "invalid m...

...rce rcaps = ignore (g#command (Array.of_list args)) in + let run_update_initramfs_command () = + let args = + "/usr/sbin/update-initramfs" :: + (if verbose () then [ "-v" ] else []) + @ [ "-c"; "-k"; mkinitrd_kv ] + in + ignore (g#command (Array.of_list args)) + in + if g#is_file ~followsymlinks:true "/sbin/dracut" then run_dracut_command "/sbin/dracut" else if g#is_file ~followsymlinks:true "/usr/bin/dracut" then @@ -878,6 +887,18 @@...

...rce rcaps = ignore (g#command (Array.of_list args)) in + let run_update_initramfs_command () = + let args = + "/usr/sbin/update-initramfs" :: + (if verbose () then [ "-v" ] else []) + @ [ "-c"; "-k"; mkinitrd_kv ] + in + ignore (g#command (Array.of_list args)) + in + if g#is_file ~followsymlinks:true "/sbin/dracut" then run_dracut_command "/sbin/dracut" else if g#is_file ~followsymlinks:true "/usr/bin/dracut" then @@ -491,6 +500,18 @@...

...rce rcaps = ignore (g#command (Array.of_list args)) in + let run_update_initramfs_command () = + let args = + "/usr/sbin/update-initramfs" :: + (if verbose () then [ "-v" ] else []) + @ [ "-c"; "-k"; mkinitrd_kv ] + in + ignore (g#command (Array.of_list args)) + in + if g#is_file ~followsymlinks:true "/sbin/dracut" then run_dracut_command "/sbin/dracut" else if g#is_file ~followsymlinks:true "/usr/bin/dracut" then @@ -491,6 +500,29 @@...

...we can turn on verbose > mode, just like for dracut: > > let run_update_initramfs_command () = > let args = > "update-initramfs" :: > (if verbose () then [ "-v" ] else []) > @ [ "-c"; "-k"; mkinitrd_kv ] > in > ignore (g#command (Array.of_list args)) > in > > The other advantage is that we can provide the kernel version we want. > The default is to update the initramfs for the latest kernel, which in > theory might not be the one we want if it were miss...

...r username then ( changed := true; diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 7967c0f..cadd515 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -795,10 +795,8 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = *) let mkinitrd_kv = let modpath = kernel.ki_modpath in - let len = String.length modpath in try - let i = String.rindex modpath '/' in - String.sub modpath (i+1) (len - (i+1)) + last_part_of modpath '/' with Not_found ->...

...d := true; > diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml > index 7967c0f..f5a716f 100644 > --- a/v2v/convert_linux.ml > +++ b/v2v/convert_linux.ml > @@ -795,13 +795,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = > *) > let mkinitrd_kv = > let modpath = kernel.ki_modpath in > - let len = String.length modpath in > - try > - let i = String.rindex modpath '/' in > - String.sub modpath (i+1) (len - (i+1)) > - with > - Not_found -> > -...

...2v/convert_linux.ml b/v2v/convert_linux.ml > > index 7967c0f..f5a716f 100644 > > --- a/v2v/convert_linux.ml > > +++ b/v2v/convert_linux.ml > > @@ -795,13 +795,9 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = > > *) > > let mkinitrd_kv = > > let modpath = kernel.ki_modpath in > > - let len = String.length modpath in > > - try > > - let i = String.rindex modpath '/' in > > - String.sub modpath (i+1) (len - (i+1)) > > - with > > -...

This way it is possible to use rm_rf_only_files, but not removing specific files. --- mllib/common_utils.ml | 8 +++++++- mllib/common_utils.mli | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 516cff3..3737b4c 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -640,13 +640,19 @@ let rmdir_on_exit = *

Hi, this series implements the first bits in v2v to convert Debian/Ubuntu (and derived) guests. The series does not complete the support (see known issues below), but all the patches here should be fit for review and inclusion. The series does not enable the conversion, yet. Known issues: * there is no grubby nor Bootloader::Tools Perl module available in Debian, so there is no way to know

...(* Dracut. *) let args = [ "/sbin/dracut" ] - @ (if verbose then [ "--verbose" ] else []) + @ (if verbose () then [ "--verbose" ] else []) @ [ "--add-drivers"; String.concat " " modules; initrd; mkinitrd_kv ] in ignore (g#command (Array.of_list args)) @@ -1244,7 +1244,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = "xvd" ^ drive_name i, block_prefix_after_conversion ^ drive_name i ) source.s_disks in - if verbose th...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623