[Pkg-libvirt-commits] [libguestfs] 03/40: v2v: Don't warn about being unable to rewrite /dev/cdrom (RHBZ#1146815).

[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.57-1
in repository libguestfs.

commit 5498d021d012522c695ddcaa8ade9cb0ede2a024
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Sep 26 19:30:57 2014 +0100

    v2v: Don't warn about being unable to rewrite /dev/cdrom (RHBZ#1146815).
    
    Old virt-v2v probably emitted the same warning.
    
    However it seems unlikely that /dev/cdrom needs to be remapped, as
    udev or the user should be able to supply a suitable symlink from
    /dev/cdrom to the removable device.  Therefore suppress this warning.
---
 v2v/convert_linux.ml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index 9bb800d..42a83bb 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -1313,7 +1313,8 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
     and replace path device =
       try List.assoc device map
       with Not_found ->
-        if string_find device "md" = -1 && string_find device "fd" = -1 then
+        if string_find device "md" = -1 && string_find device "fd" = -1 &&
+          device <> "cdrom" then
           warning ~prog (f_"%s references unknown device \"%s\".  You may have to fix this entry manually after conversion.")
             path device;
         device

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