From 0e94016462f16ed88f7a6b7c310f35fa6322cebb Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 8 May 2009 13:19:48 -0700 Subject: [PATCH] Delete error message -- it's also occurring on 2.6.28 --- Shorewall/Perl/Shorewall/Tc.pm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index 3451bf81e..ba080a284 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -967,21 +967,14 @@ sub setup_traffic_shaping() { if ( $devref->{occurs} ) { # - # Depending on the installed networking kit, the following command may succeed yet generate an error message and non-zero exit - # status :-(. We thus run it silently and check the result. Note that since this is the first filter added after the root - # qdisc was added, the 'ls | grep' test is fairly robust - # - # Additional notes: - # - # - The command returns non-zero exit status on OpenSuSE 11.0 and 11.1 and on Debian Lenny - # - The command returns zero exit status on Ubuntu Jaunty + # The following command may succeed yet generate an error message and non-zero exit status :-(. We thus run it silently + # and check the result. Note that since this is the first filter added after the root qdisc was added, the 'ls | grep' test + # is fairly robust # my $command = "\$TC filter add dev $device parent $devnum:0 prio 65535 protocol ip fw"; emit( qq(if ! qt $command ; then) , - qq( if \$TC filter list dev $device | grep -q 65535; then) , - qq( error_message "WARNING: Command '$command' succeeded but returned non-zero exit status") , - qq( else), + qq( if ! \$TC filter list dev $device | grep -q 65535; then) , qq( error_message "ERROR: Command '$command' failed"), qq( stop_firewall), qq( exit 1),