[Libguestfs] [PATCH 1/4] Rename RedHat.pm to Linux.pm

Mike Latimer
Thu, 31 Oct 2013 20:14:04 -0000

---
 MANIFEST                                           |  2 +-
 .../VirtConvert/Converter/{RedHat.pm => Linux.pm}  | 39
+++++++++++-----------
 po/POTFILES.in                                     |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 3724fde..19962a6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -16,7 +16,7 @@ lib/Sys/VirtConvert/Connection/Source.pm
 lib/Sys/VirtConvert/Connection/VMwareOVASource.pm
 lib/Sys/VirtConvert/Connection/Volume.pm
 lib/Sys/VirtConvert/Converter.pm
-lib/Sys/VirtConvert/Converter/RedHat.pm
+lib/Sys/VirtConvert/Converter/Linux.pm
 lib/Sys/VirtConvert/Converter/Windows.pm
 lib/Sys/VirtConvert/ExecHelper.pm
 lib/Sys/VirtConvert/GuestfsHandle.pm
diff --git a/lib/Sys/VirtConvert/Converter/RedHat.pm
b/lib/Sys/VirtConvert/Converter/Linux.pm
similarity index 98%
rename from lib/Sys/VirtConvert/Converter/RedHat.pm
rename to lib/Sys/VirtConvert/Converter/Linux.pm
index f3926e8..dd3573e 100644
--- a/lib/Sys/VirtConvert/Converter/RedHat.pm
+++ b/lib/Sys/VirtConvert/Converter/Linux.pm
@@ -1,5 +1,6 @@
-# Sys::VirtConvert::Converter::RedHat
+# Sys::VirtConvert::Converter::Linux
 # Copyright (C) 2009-2012 Red Hat Inc.
+# Copyright (C) 2013 SUSE Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,7 +22,7 @@ use warnings;

 # Functions supported by grubby, and therefore common between gruby legacy and
 # grub2
-package Sys::VirtConvert::Converter::RedHat::Grub;
+package Sys::VirtConvert::Converter::Linux::Grub;

 use Sys::VirtConvert::Util;
 use Locale::TextDomain 'virt-v2v';
@@ -61,15 +62,15 @@ sub check_efi


 # Methods for inspecting and manipulating grub legacy
-package Sys::VirtConvert::Converter::RedHat::GrubLegacy;
+package Sys::VirtConvert::Converter::Linux::GrubLegacy;

 use Sys::VirtConvert::Util qw(:DEFAULT augeas_error);

 use File::Basename;
 use Locale::TextDomain 'virt-v2v';

-@Sys::VirtConvert::Converter::RedHat::GrubLegacy::ISA -
qw(Sys::VirtConvert::Converter::RedHat::Grub);
+@Sys::VirtConvert::Converter::Linux::GrubLegacy::ISA +
qw(Sys::VirtConvert::Converter::Linux::Grub);

 sub new
 {
@@ -251,7 +252,7 @@ sub check
     return if scalar(@entries) > 0;

     my $kernel -
Sys::VirtConvert::Converter::RedHat::_inspect_linux_kernel($g, $path);
+        Sys::VirtConvert::Converter::Linux::_inspect_linux_kernel($g, $path);
     my $version = $kernel->{version};
     my $grub_initrd = dirname($path)."/initrd-$version";

@@ -365,13 +366,13 @@ sub convert_efi
 # attempt to use grub2's configuration because it's utterly insane.
Instead,
 # we reverse engineer the way the config is automatically generated and use
 # that instead.
-package Sys::VirtConvert::Converter::RedHat::Grub2;
+package Sys::VirtConvert::Converter::Linux::Grub2;

 use Sys::VirtConvert::Util qw(:DEFAULT augeas_error);
 use Locale::TextDomain 'virt-v2v';

-@Sys::VirtConvert::Converter::RedHat::Grub2::ISA -
qw(Sys::VirtConvert::Converter::RedHat::Grub);
+@Sys::VirtConvert::Converter::Linux::Grub2::ISA +
qw(Sys::VirtConvert::Converter::Linux::Grub);

 sub new
 {
@@ -486,7 +487,7 @@ sub convert_efi

     # EFI systems boot using grub2-efi, and probably don't have the base
grub2
     # package installed.
-    Sys::VirtConvert::Convert::RedHat::_install_any
+    Sys::VirtConvert::Convert::Linux::_install_any
         (undef, ['grub2'], undef, $g, $self->{root},
$self->{config}, $self)
         or v2vdie __x('Failed to install non-EFI grub2');

@@ -509,7 +510,7 @@ sub convert_efi
 }


-package Sys::VirtConvert::Converter::RedHat;
+package Sys::VirtConvert::Converter::Linux;

 use Sys::VirtConvert::Util qw(:DEFAULT augeas_error scsi_first_cmp);
 use Locale::TextDomain 'virt-v2v';
@@ -518,7 +519,7 @@ use Locale::TextDomain 'virt-v2v';

 =head1 NAME

-Sys::VirtConvert::Converter::RedHat - Convert a Red Hat based guest to run on
KVM
+Sys::VirtConvert::Converter::Linux - Convert a Linux based guest to run on KVM

 =head1 SYNOPSIS

@@ -528,7 +529,7 @@ Sys::VirtConvert::Converter::RedHat - Convert a Red Hat
based guest to run on KV

 =head1 DESCRIPTION

-Sys::VirtConvert::Converter::RedHat converts a Red Hat based guest to use KVM.
+Sys::VirtConvert::Converter::Linux converts a Linux based guest to use KVM.

 =head1 METHODS

@@ -544,9 +545,9 @@ sub _is_rhel_family
            ($g->inspect_get_distro($root) =~
/^(rhel|centos|scientificlinux|redhat-based)$/);
 }

-=item Sys::VirtConvert::Converter::RedHat->can_handle(g, root)
+=item Sys::VirtConvert::Converter::Linux->can_handle(g, root)

-Return 1 if Sys::VirtConvert::Converter::RedHat can convert the given guest
+Return 1 if Sys::VirtConvert::Converter::Linux can convert the given guest

 =cut

@@ -560,9 +561,9 @@ sub can_handle
             (_is_rhel_family($g, $root) || $g->inspect_get_distro($root) eq
'fedora'));
 }

-=item Sys::VirtConvert::Converter::RedHat->convert(g, root, config, meta,
options)
+=item Sys::VirtConvert::Converter::Linux->convert(g, root, config, meta,
options)

-Convert a Red Hat based guest. Assume that can_handle has previously returned
1.
+Convert a Linux based guest. Assume that can_handle has previously returned 1.

 =over

@@ -601,8 +602,8 @@ sub convert
     _init_augeas($g);

     my $grub;
-    $grub = eval { Sys::VirtConvert::Converter::RedHat::Grub2->new($g,
$root, $config) };
-    $grub = eval { Sys::VirtConvert::Converter::RedHat::GrubLegacy->new($g,
$root) }
+    $grub = eval { Sys::VirtConvert::Converter::Linux::Grub2->new($g, $root,
$config) };
+    $grub = eval { Sys::VirtConvert::Converter::Linux::GrubLegacy->new($g,
$root) }
         unless defined($grub);
     v2vdie __('No grub configuration found') unless defined($grub);

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d613060..4c8d435 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,7 +13,7 @@
 ../lib/Sys/VirtConvert/Transfer/SSH.pm
 ../lib/Sys/VirtConvert/Transfer/ESX.pm
 ../lib/Sys/VirtConvert/Config.pm
-../lib/Sys/VirtConvert/Converter/RedHat.pm
+../lib/Sys/VirtConvert/Converter/Linux.pm
 ../lib/Sys/VirtConvert/Converter/Windows.pm
 ../lib/Sys/VirtConvert/GuestfsHandle.pm
 ../p2v/server/virt-p2v-server.pl
--
1.8.1.4