monitoring/SatConfig/cluster/IpAddr.pm | 2 +-
monitoring/SatConfig/cluster/SatConfig-cluster.spec | 5 ++++-
rel-eng/packages/SatConfig-cluster | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit f7ed1518003a3f790ad9510b20711ade597a51b0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 25 11:46:42 2014 +0100
Automatic commit of package [SatConfig-cluster] release [2.2.2-1].
diff --git a/monitoring/SatConfig/cluster/SatConfig-cluster.spec
b/monitoring/SatConfig/cluster/SatConfig-cluster.spec
index 7302cdc..e48c819 100644
--- a/monitoring/SatConfig/cluster/SatConfig-cluster.spec
+++ b/monitoring/SatConfig/cluster/SatConfig-cluster.spec
@@ -1,6 +1,6 @@
%define sysv_dir %{_sysconfdir}/rc.d/np.d
Name: SatConfig-cluster
-Version: 2.2.1
+Version: 2.2.2
Release: 1%{?dist}
Summary: Satellite Configuration System - cluster information
URL:
https://fedorahosted.org/spacewalk
@@ -56,6 +56,9 @@ install -m 644 SatCluster.pm $RPM_BUILD_ROOT%{perl_vendorlib}/NOCpulse/
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 25 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.2.2-1
+- 1069332 - fixing ip syntax
+
* Tue Feb 25 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.2.1-1
- 1069332 - simplify regexp
- 1069332 - Use /sbin/ip instead of /sbin/ifconfig.
diff --git a/rel-eng/packages/SatConfig-cluster b/rel-eng/packages/SatConfig-cluster
index a14d2cc..61abcbf 100644
--- a/rel-eng/packages/SatConfig-cluster
+++ b/rel-eng/packages/SatConfig-cluster
@@ -1 +1 @@
-2.2.1-1 monitoring/SatConfig/cluster/
+2.2.2-1 monitoring/SatConfig/cluster/
commit 449db5258269a6a6fc0e205af44d7f36c382db60
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 25 11:45:12 2014 +0100
1069332 - fixing ip syntax
diff --git a/monitoring/SatConfig/cluster/IpAddr.pm
b/monitoring/SatConfig/cluster/IpAddr.pm
index 91c23c7..da4e920 100644
--- a/monitoring/SatConfig/cluster/IpAddr.pm
+++ b/monitoring/SatConfig/cluster/IpAddr.pm
@@ -96,7 +96,7 @@ sub macAddress
{
my $self = shift();
my $dev = $self->get_dev;
- my $mac = `/sbin/ip -o link $dev`;
+ my $mac = `/sbin/ip -o link show $dev`;
if ($mac =~ /ether (\S*)/m) {
return $1;
} else {