]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #12818 from yuwata/network-issue-8726
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 3 Oct 2019 13:21:35 +0000 (15:21 +0200)
committerGitHub <noreply@github.com>
Thu, 3 Oct 2019 13:21:35 +0000 (15:21 +0200)
network: disable kernel creating prefix route when RouteTable= is set

1  2 
src/network/networkd-dhcp4.c
src/network/networkd-link.h
src/network/networkd-manager.h
test/test-network/systemd-networkd-tests.py

Simple merge
index d364692c864d1100ad04ab8307f223934cfbb60b,429a053fdf038da172c117312933854fb533c0db..446c042fb9b9d125a8bdb6e561a126a6a150dc90
@@@ -97,12 -97,12 +99,11 @@@ typedef struct Link 
  
          sd_ipv4ll *ipv4ll;
          bool ipv4ll_address:1;
 -        bool ipv4ll_route:1;
  
-         bool neighbors_configured;
-         bool static_routes_configured;
-         bool routing_policy_rules_configured;
-         bool setting_mtu;
+         bool neighbors_configured:1;
+         bool static_routes_configured:1;
+         bool routing_policy_rules_configured:1;
+         bool setting_mtu:1;
  
          LIST_HEAD(Address, pool_addresses);
  
Simple merge