[Pkg-libvirt-commits] [libguestfs] 18/146: v2v: linux: In verbose mode, add dracut --verbose parameter.

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository libguestfs.

commit 350dc02d3756725324ffb70e2dc98534e35a35bc
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Nov 19 13:20:13 2014 +0000

    v2v: linux: In verbose mode, add dracut --verbose parameter.
    
    So we can see exactly what dracut is doing in the debug output.
    
    (cherry picked from commit 171e6383a217b9f575316929047300d5c8ab4948)
---
 v2v/convert_linux.ml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index f2736f1..94ceefb 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -846,11 +846,12 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
 
       if g#is_file ~followsymlinks:true "/sbin/dracut" then (
         (* Dracut. *)
-        ignore (
-          g#command [| "/sbin/dracut";
-                       "--add-drivers"; String.concat " " modules;
-                       initrd; mkinitrd_kv |]
-        )
+        let args =
+          [ "/sbin/dracut" ]
+          @ (if verbose then [ "--verbose" ] else [])
+          @ [ "--add-drivers"; String.concat " " modules; initrd; mkinitrd_kv ]
+        in
+        ignore (g#command (Array.of_list args))
       )
       else if family = `SUSE_family
            && g#is_file ~followsymlinks:true "/sbin/mkinitrd" then (

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