[PATCH 1/5] sysprep: remove /var/log/audit/audit.log
by Wanlong Gao
audit.log is already included in /var/log/audit/*.
Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com>
---
sysprep/sysprep_operation_logfiles.ml | 1 -
1 file changed, 1 deletion(-)
diff --git a/sysprep/sysprep_operation_logfiles.ml b/sysprep/sysprep_operation_logfiles.ml
index 842b855..cdfe8fc 100644
--- a/sysprep/sysprep_operation_logfiles.ml
+++ b/sysprep/sysprep_operation_logfiles.ml
@@ -40,7 +40,6 @@ let globs = List.sort compare [
"/var/log/wtmp*";
"/var/log/apache2/*_log";
"/var/log/apache2/*_log-*";
- "/var/log/audit/audit.log";
"/var/log/ntp";
(* logfiles configured by /etc/logrotate.d/* *)
--
1.8.4.27.g0a41de8
11 years, 2 months
[PATCH] virt-v2v: Remove iface:ide parameter (RHBZ#895898)
by Mike Latimer
The iface:ide parameter (used in the libguestfs add_drive call) does not work
with a libvirt backend. The error usually seen is:
'iface' parameter is not supported by the libvirt attach-method at
/usr/share/perl5/vendor_perl/Sys/VirtConvert/GuestfsHandle.pm line 96.
This issue was previously mentioned in this thread:
https://www.redhat.com/archives/libguestfs/2013-February/msg00057.html, and a
workaround of 'export LIBGUESTFS_ATTACH_METHOD=appliance' was suggested.
However, as mentioned in the bug, this parameter is likely no longer required.
Unless there is a use-case where this setting is required, it seems like a
good idea to remove it completely (which should work in
either libvirt or direct mode), rather than recommend the workaround.
---
lib/Sys/VirtConvert/GuestfsHandle.pm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/Sys/VirtConvert/GuestfsHandle.pm
b/lib/Sys/VirtConvert/GuestfsHandle.pm
index 549ba11..71f11da 100644
--- a/lib/Sys/VirtConvert/GuestfsHandle.pm
+++ b/lib/Sys/VirtConvert/GuestfsHandle.pm
@@ -73,21 +73,18 @@ sub new
# Open a guest handle
my $g;
my $open = sub {
- my $interface = "ide";
-
$g = Sys::Guestfs->new();
foreach my $disk (@{$disks}) {
my ($name, $path, $format) = @$disk;
$g->add_drive_opts($path,
format => $format,
- iface => $interface,
name => $name);
}
# Add the transfer iso if there is one
$g->add_drive_opts($transfer,
- format => 'raw', iface => $interface, readonly =>
1)
+ format => 'raw', readonly => 1)
if defined($transfer);
# Enable networking in the guest
--
1.8.1.4
11 years, 2 months
[PATCH] virt-v2v: Fix 'isn't numeric in numeric gt' error in grub check (RHBZ#974441)
by Mike Latimer
This patch fixes an incorrect integer comparison that results in the following
error:
Argument "/files/boot/grub/menu.lst/title[1]/kernel" isn't numeric in numeric
gt (>) at /usr/share/perl5/vendor_perl/Sys/VirtConvert/Converter/RedHat.pm
line 206.
This problem is not fatal, but it can result in duplicate entries in menu.lst.
---
lib/Sys/VirtConvert/Converter/RedHat.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Sys/VirtConvert/Converter/RedHat.pm
b/lib/Sys/VirtConvert/Converter/RedHat.pm
index 36345e7..f1d3b98 100644
--- a/lib/Sys/VirtConvert/Converter/RedHat.pm
+++ b/lib/Sys/VirtConvert/Converter/RedHat.pm
@@ -247,7 +247,7 @@ sub check
my $grub_path = $1;
# Nothing to do if the kernel already has a grub entry
- return if $g->aug_match("/files$grub_conf/title/kernel[. = '$grub_path']")
> 0;
+ return if $g->aug_match("/files$grub_conf/title/kernel[. = '$grub_path']")
ne '';
my $kernel =
Sys::VirtConvert::Converter::RedHat::_inspect_linux_kernel($g,
$path);
--
1.8.1.4
11 years, 2 months
