On Fri, Feb 24, 2017 at 04:05:06PM +0100, Pino Toscano wrote:
Make the documentation in Convert_linux more generic than just
Enterprise distros using RPM. Also, rename the name of the module from
"enterprise-linux" to simply "linux".
---
v2v/convert_linux.ml | 10 +++++-----
v2v/virt-v2v.pod | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
index 7d65516..05da590 100644
--- a/v2v/convert_linux.ml
+++ b/v2v/convert_linux.ml
@@ -16,12 +16,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-(* Convert various RPM-based Linux enterprise distros. This module
- * handles:
+(* Convert various Linux distros. This module handles:
*
* - RHEL and derivatives like CentOS and ScientificLinux
* - SUSE
- * - OpenSUSE and Fedora (not enterprisey, but similar enough to RHEL/SUSE)
+ * - OpenSUSE and Fedora (similar enough to RHEL/SUSE)
+ * - Debian and derivatives like Ubuntu and Linux Mint
*)
(* < mdbooth> It's all in there for a reason :/ *)
@@ -44,7 +44,7 @@ let rec convert (g : G.guestfs) inspect source output rcaps =
* the common v2v.ml code, but that has to deal with generic guests
* (anything common to Linux and Windows). Here we do more detailed
* inspection which can make the assumption that we are dealing with
- * an Enterprise Linux guest using RPM.
+ * an Linux guest using RPM or Debian packages.
"a Linux guest"
*)
(* Basic inspection data available as local variables. *)
@@ -1059,4 +1059,4 @@ let () =
i_distro = ("debian" | "ubuntu" | "linuxmint") }
-> true
| _ -> false
in
- Modules_list.register_convert_module matching "enterprise-linux" convert
+ Modules_list.register_convert_module matching "linux" convert
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
index ba91851..3d0eada 100644
--- a/v2v/virt-v2v.pod
+++ b/v2v/virt-v2v.pod
@@ -1910,7 +1910,7 @@ virt-v2v binary. Typical output looks like this:
[...]
output:local
[...]
- convert:enterprise-linux
+ convert:linux
convert:windows
A list of features is printed, one per line, and the program exits
--
2.9.3
ACK with the change above.
Rich.
--
Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
Read my programming and virtualization blog:
http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW