rpms/tuned/F-12 tuned-unsupported-ethernet-cards.patch, NONE, 1.1 tuned.spec, 1.14, 1.15

[jvcelak]

Author: jvcelak

Update of /cvs/pkgs/rpms/tuned/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30240

Modified Files:
	tuned.spec 
Added Files:
	tuned-unsupported-ethernet-cards.patch 
Log Message:
- Fixed 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
  Some ethernet cards are not supported by 'ethtool'.


tuned-unsupported-ethernet-cards.patch:
 tuned_nettool.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE tuned-unsupported-ethernet-cards.patch ---
commit 94b46b4e38fa056e21e35087681c06a00ad9d0ff
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Mon Dec 21 13:14:45 2009 +0100

    tuned_nettool.py: bz 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
    
    Some strange network cards (e.g. Unknown (0x1062)) are not supported
    by 'ethtool'. The tool reports not very obviously:
    
    Cannot get device settings: Operation not permitted
    Cannot get wake-on-lan settings: Operation not permitted
    Cannot get link status: Operation not permitted

diff --git a/tuned_nettool.py b/tuned_nettool.py
index 9fb2ce0..6119154 100644
--- a/tuned_nettool.py
+++ b/tuned_nettool.py
@@ -132,7 +132,11 @@ class Tuned_nettool:
 		errors = p_ethtool.communicate()[1]
 
 		if errors != "":
-			raise Exception("Some errors were reported by 'ethtool'.", errors)
+			# it is possible that the network card is not supported
+			self.__clean_status()
+			return
+			# TODO: subject of logging
+			#raise Exception("Some errors were reported by 'ethtool'.", errors)
 
 		# parses output - kind of FSM
 


Index: tuned.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuned/F-12/tuned.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tuned.spec	11 Dec 2009 13:07:51 -0000	1.14
+++ tuned.spec	21 Dec 2009 13:46:45 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 0.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 # The source for this package was pulled from upstream git.  Use the
@@ -11,6 +11,8 @@ Group: System Environment/Daemons
 #  git checkout v%{version}
 #  make archive
 Source: tuned-%{version}.tar.bz2
+# bz 542305, git 94b46b4e38fa056e21e35087681c06a00ad9d0ff
+Patch0: tuned-unsupported-ethernet-cards.patch
 URL: https://fedorahosted.org/tuned/
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: python
@@ -42,6 +44,7 @@ instead of fewer large ones).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -102,6 +105,10 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Jan Vcelak <jvcelak at redhat.com> 0.2.7-2
+- Fixed 542305 - [abrt] crash detected in tuned-0.2.5-2.fc12
+  Some ethernet cards are not supported by 'ethtool'.
+
 * Fri Dec 11 2009 Thomas Woerner <twoerner at redhat.com> 0.2.7-1
 - Updated ktune to version 0.4-1
   - Supports start and stop options in profile scripts calls