Do not try to disable rp_filter for vlan interfaces

zentyal · Mar 7, 2013 · e010c82 · e010c82
1 parent 81ff309
commit e010c82
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/main/network/ChangeLog b/main/network/ChangeLog
@@ -1,4 +1,5 @@
 HEAD
+	+ Do not try to disable rp_filter for vlan interfaces
 	+ Only disable IPv6 in enableActions if IPv6 is available
 	+ Bridged interfaces added to 'auto' directive in
 	  /etc/networks/interfaces to avoid network startup problems

diff --git a/main/network/src/EBox/Network.pm b/main/network/src/EBox/Network.pm
@@ -3011,9 +3011,14 @@ sub _disableReversePath
         $iface = $self->realIface($iface);
         # remove viface portion
         $iface =~ s/:.*$//;
-        $seen{$iface} and
-            next;
+
+        next if $seen{$iface};
         $seen{$iface} = 1;
+
+        # Skipping vlan interfaces as it seems rp_filter key doesn't
+        # exist for them
+        next ($iface =~ /^vlan/);
+
         push (@cmds, "/sbin/sysctl -q -w net.ipv4.conf.$iface.rp_filter=0");
     }