From ed1fafc472ac63435db5a19a9c63fe10f6cd2f37 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 2 Mar 2018 09:38:56 +0100 Subject: [PATCH] Report: remove useless version check this is packaged with pve-manager and runs locally on the node, so we're pretty sure that the version is the one from pve-manager anyway, this check just makes no sense... Signed-off-by: Thomas Lamprecht --- PVE/Report.pm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/PVE/Report.pm b/PVE/Report.pm index eaf7c82f..13cbbde3 100644 --- a/PVE/Report.pm +++ b/PVE/Report.pm @@ -27,24 +27,15 @@ if (system('command -v multipath > /dev/null 2>&1') == 0) { push @disks, 'multipath -ll', 'multipath -v3' } -my @machines = ('qm list', sub { dir2text('/etc/pve/qemu-server/', '\d.*conf') }); +my @machines = ('qm list', sub { dir2text('/etc/pve/qemu-server/', '\d.*conf') }, sub { dir2text('/etc/pve/lxc/', '\d.*conf') }); my @net = ('ip -details -statistics address', 'cat /etc/network/interfaces', sub { dir2text('/etc/pve/firewall/', '.*fw') }, 'iptables-save'); -my @cluster = ('pvecm nodes', 'pvecm status'); +my @cluster = ('pvecm nodes', 'pvecm status', 'cat /etc/pve/corosync.conf 2> /dev/null' ); my @bios = ('dmidecode -t bios'); -if (PVE::pvecfg::version() >= 4.0) { - push @cluster, 'cat /etc/pve/corosync.conf 2> /dev/null' ; - push @machines, sub { dir2text('/etc/pve/lxc/', '\d.*conf') }; -} else { - push @general, 'grep --max-count=1 "model name" /proc/cpuinfo'; - push @machines, sub { dir2text('/etc/pve/openvz/', '\d.*conf') }; - push @cluster, 'clustat', 'cat /etc/cluster.conf 2> /dev/null'; -} - my $general_report = { title => 'general system info', commands => \@general,