]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #10948 from ssahani/iprule-port-proto
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 28 Nov 2018 18:17:36 +0000 (03:17 +0900)
committerGitHub <noreply@github.com>
Wed, 28 Nov 2018 18:17:36 +0000 (03:17 +0900)
networkd: add support to configure ip rule port range and protocol.

1  2 
meson.build
src/network/networkd-link.c
test/test-network/systemd-networkd-tests.py

diff --cc meson.build
Simple merge
Simple merge
index 74c0e10008386afe7043fee2788eedb35fe7660c,f9372d27ee613e507cb2e487ff6fe4f522b56f3f..130b20f82f8fc94e23ba29c0abe948ea4de2d115
@@@ -427,11 -427,11 +427,11 @@@ class NetworkdNetWorkTests(unittest.Tes
      units = ['12-dummy.netdev', 'test-static.network', 'configure-without-carrier.network', '11-dummy.netdev',
               '23-primary-slave.network', '23-test1-bond199.network', '11-dummy.netdev', '23-bond199.network',
               '25-bond-active-backup-slave.netdev', '12-dummy.netdev', '23-active-slave.network',
-              'routing-policy-rule.network', '25-address-section.network', '25-address-section-miscellaneous.network',
-              '25-route-section.network', '25-route-type.network', '25-route-tcp-window-settings.network',
-              '25-route-gateway.network', '25-route-gateway-on-link.network',
+              'routing-policy-rule.network', '25-fibrule-port-range.network', '25-address-section.network',
+              '25-address-section-miscellaneous.network', '25-route-section.network', '25-route-type.network',
+              '25-route-tcp-window-settings.network', '25-route-gateway.network', '25-route-gateway-on-link.network',
               '25-address-link-section.network', '25-ipv6-address-label-section.network', '25-link-section-unmanaged.network',
 -             '25-sysctl.network']
 +             '25-sysctl.network', '25-route-reverse-order.network']
  
      def setUp(self):
          self.link_remove(self.links)