[Pkg-libvirt-commits] [libguestfs] 92/146: v2v: Treat "oraclelinux" as if it was plain RHEL (RHBZ#1174280).

[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 ff4088580b356fe16c821fb12eb7e37ff54fa0ac
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Dec 15 14:51:57 2014 +0000

    v2v: Treat "oraclelinux" as if it was plain RHEL (RHBZ#1174280).
    
    (cherry picked from commit 045dcfbd1848cb1c591dafe962d9bed45c1a9879)
---
 v2v/convert_linux.ml | 4 +++-
 v2v/virt-v2v.pod     | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index ff09408..b689c5f 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -74,7 +74,8 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
   let family =
     match inspect.i_distro with
     | "fedora"
-    | "rhel" | "centos" | "scientificlinux" | "redhat-based" -> `RHEL_family
+    | "rhel" | "centos" | "scientificlinux" | "redhat-based"
+    | "oraclelinux" -> `RHEL_family
     | "sles" | "suse-based" | "opensuse" -> `SUSE_family
     | _ -> assert false in
 
@@ -1461,6 +1462,7 @@ let () =
     | { i_type = "linux";
         i_distro = ("fedora"
                        | "rhel" | "centos" | "scientificlinux" | "redhat-based"
+                       | "oraclelinux"
                        | "sles" | "suse-based" | "opensuse") } -> true
     | _ -> false
   in
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
index f075274..4e8942e 100644
--- a/v2v/virt-v2v.pod
+++ b/v2v/virt-v2v.pod
@@ -211,6 +211,8 @@ And hence L<virsh(1)>, L<virt-manager(1)>, and similar tools.
 
 =item Scientific Linux 3, 4, 5, 6, 7
 
+=item Oracle Linux
+
 =item Fedora
 
 =item SLES 10 and up

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