From 9dffe6fc2713c3d6fd69419d7b5476ccb15a8dcf Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 21 Aug 2020 15:27:35 +0900
Subject: [PATCH 1/2] test-network: add a test case for reconfiguring routing
 policy rules

C.f. #16784.
---
 test/test-network/systemd-networkd-tests.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 0ca1fb3bf9..f12917cdd9 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -1976,6 +1976,25 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
         self.assertRegex(output, 'iif test1')
         self.assertRegex(output, 'lookup 9')
 
+        run('ip rule delete iif test1 priority 111')
+
+        output = check_output('ip rule list iif test1 priority 111')
+        print(output)
+        self.assertEqual(output, '')
+
+        run(*networkctl_cmd, 'reconfigure', 'test1', env=env)
+
+        self.wait_online(['test1:degraded'])
+
+        output = check_output('ip rule list iif test1 priority 111')
+        print(output)
+        self.assertRegex(output, '111:')
+        self.assertRegex(output, 'from 192.168.100.18')
+        self.assertRegex(output, r'tos (0x08|throughput)\s')
+        self.assertRegex(output, 'iif test1')
+        self.assertRegex(output, 'oif test1')
+        self.assertRegex(output, 'lookup 7')
+
     def test_routing_policy_rule_issue_11280(self):
         copy_unit_to_networkd_unit_path('routing-policy-rule-test1.network', '11-dummy.netdev',
                                         'routing-policy-rule-dummy98.network', '12-dummy.netdev')

From d91b9bbce881c7e0d2ee80208325be59924b0e8f Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 21 Aug 2020 15:30:05 +0900
Subject: [PATCH 2/2] man: fix invalid tag place

---
 man/networkd.conf.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
index e8e41ebe92..821212c343 100644
--- a/man/networkd.conf.xml
+++ b/man/networkd.conf.xml
@@ -52,8 +52,8 @@
         <term><varname>SpeedMeter=</varname></term>
         <listitem><para>Takes a boolean. If set to yes, then <command>systemd-networkd</command>
         measures the traffic of each interface, and
-        <command>networkctl status <replaceable>INTERFACE</replaceable> shows the measured speed.
-        </command>Defaults to no.</para></listitem>
+        <command>networkctl status <replaceable>INTERFACE</replaceable></command> shows the measured speed.
+        Defaults to no.</para></listitem>
       </varlistentry>
 
       <varlistentry>