search for: f9aa334

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 ~keep_serial_console (g : G.guestfs) inspect source rcaps = Linux.augeas_init g; (* Clean RPM database. This must be done early to avoid RHBZ#1143866. *) - let dbfiles = g#glob_expand &...

...the device name. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> Signed-off-by: Richard W.M. Jones <rjones@redhat.com> --- v2v/convert_linux.ml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 4b1ce99..f9aa334 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -1329,8 +1329,10 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = let replace device = try List.assoc device map with Not_found -> - if String.find device "md&quot...

...loader. *) +end +(** Encapsulates a UNIX boot loader as object. *) + +val detect_bootloader : Guestfs.guestfs -> Types.inspect -> bootloader +(** Detects the bootloader on the guest, and creates the object + representing it. *) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index f9aa334..77d9d8e 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -89,36 +89,8 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = let dbfiles = Array.to_list dbfiles in List.iter g#rm_f dbfiles; - (* What grub is installed? *) - let grub_config, grub = -...

...tes a UNIX boot loader as object. *) > + > +val detect_bootloader : Guestfs.guestfs -> Types.inspect -> bootloader > +(** Detects the bootloader on the guest, and creates the object > + representing it. *) > diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml > index f9aa334..77d9d8e 100644 > --- a/v2v/convert_linux.ml > +++ b/v2v/convert_linux.ml > @@ -89,36 +89,8 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = > let dbfiles = Array.to_list dbfiles in > List.iter g#rm_f dbfiles; > > - (* What grub is install...