[Pkg-libvirt-commits] [libguestfs] 16/35: v2v: Rebuild initrd last.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.49-1
in repository libguestfs.

commit f982ce27032371c43e167609e0631bc792382da7
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Sep 17 15:13:21 2014 +0100

    v2v: Rebuild initrd last.
    
    Old virt-v2v rebuilt the initrd late.  Currently we rebuild the initrd
    right after choosing a kernel, but it's best to update the initrd
    at the end since mkinitrd may depend on other configuration files
    that we are changing (especially see next commit).
---
 v2v/convert_linux.ml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index 29dafde..dc2a872 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -749,10 +749,10 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
     if best_kernel <> List.hd grub_kernels then
       grub_set_bootable best_kernel;
 
-    rebuild_initrd best_kernel;
-
     (* Does the best/bootable kernel support virtio? *)
-    best_kernel.ki_supports_virtio
+    let virtio = best_kernel.ki_supports_virtio in
+
+    best_kernel, virtio
 
   and grub_set_bootable kernel =
     let cmd =
@@ -1234,7 +1234,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
   unconfigure_efi ();
   unconfigure_kudzu ();
 
-  let virtio = configure_kernel () in
+  let kernel, virtio = configure_kernel () in
 
   if keep_serial_console then (
     configure_console ();
@@ -1255,6 +1255,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
   *)
 
   remap_block_devices virtio;
+  rebuild_initrd kernel;
 
   let guestcaps = {
     gcaps_block_bus = if virtio then Virtio_blk else IDE;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git