picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13179 from yuwata/network-drop-new-settings-from-dhcp-section 

network: drop recently added settings from deprecated [DHCP] section
This commit is contained in:
Yu Watanabe 2019-07-25 15:44:25 +09:00 committed by GitHub
parent 26ce7c3bc8 4bd04e3dcb
commit 0a9219986e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/networkd-network-gperf.gperf
View File

@ -242,7 +242,6 @@ DHCP.Hostname, config_parse_hostname,
DHCP.RequestBroadcast, config_parse_bool, 0, offsetof(Network, dhcp_broadcast)
DHCP.CriticalConnection, config_parse_tristate, 0, offsetof(Network, dhcp_critical)
DHCP.VendorClassIdentifier, config_parse_string, 0, offsetof(Network, dhcp_vendor_class_identifier)
DHCP.MaxAttempts, config_parse_dhcp_max_attempts, 0, 0
DHCP.UserClass, config_parse_dhcp_user_class, 0, offsetof(Network, dhcp_user_class)
DHCP.DUIDType, config_parse_duid_type, 0, offsetof(Network, duid)
DHCP.DUIDRawData, config_parse_duid_rawdata, 0, offsetof(Network, duid)
@ -251,8 +250,6 @@ DHCP.RouteTable, config_parse_section_route_table,
DHCP.UseTimezone, config_parse_bool, 0, offsetof(Network, dhcp_use_timezone)
DHCP.IAID, config_parse_iaid, 0, 0
DHCP.ListenPort, config_parse_uint16, 0, offsetof(Network, dhcp_client_port)
DHCP.SendRelease, config_parse_bool, 0, offsetof(Network, dhcp_send_release)
DHCP.BlackList, config_parse_dhcp_black_listed_ip_address, 0, 0
DHCP.RapidCommit, config_parse_bool, 0, offsetof(Network, rapid_commit)
DHCP.ForceDHCPv6PDOtherInformation, config_parse_bool, 0, offsetof(Network, dhcp6_force_pd_other_information)
DHCPv4.UseDomainName, config_parse_dhcp_use_domains, 0, offsetof(Network, dhcp_use_domains)

3
test/fuzz/fuzz-network-parser/directives.network
View File

@ -64,9 +64,6 @@ ClientIdentifier=
ListenPort=
UseTimezone=
RouteTable=
BlackList=
SendRelease=
MaxAttempts=
[DHCPv4]
UseDNS=
RoutesToDNS=

2
test/test-network/conf/dhcp-client-anonymize.network
View File

@ -5,7 +5,7 @@ Name=veth99
DHCP=ipv4
IPv6AcceptRA=false
[DHCP]
[DHCPv4]
Anonymize=true
UseMTU=true
UseRoutes=true

2
test/test-network/conf/dhcp-client-ipv4-dhcp-settings.network
View File

@ -5,7 +5,7 @@ Name=veth99
DHCP=ipv4
IPv6AcceptRA=false
[DHCP]
[DHCPv4]
UseMTU=true
UseRoutes=true
SendHostname=true

2
test/test-network/conf/dhcp-client-ipv6-rapid-commit.network
View File

@ -4,5 +4,5 @@ Name=veth99
[Network]
DHCP=ipv6
[DHCP]
[DHCPv6]
RapidCommit=false

5
test/test-network/conf/dhcp-client-listen-port.network
View File

@ -2,7 +2,8 @@
Name=veth99
[Network]
DHCP=yes
DHCP=ipv4
IPv6AcceptRA=no
[DHCP]
[DHCPv4]
ListenPort=5555

2
test/test-network/conf/dhcp-client-reassign-static-routes-ipv4.network
View File

@ -14,5 +14,5 @@ Destination=192.168.6.0/24
[Route]
Destination=192.168.7.0/24
[DHCP]
[DHCPv4]
UseRoutes=no

2
test/test-network/conf/dhcp-client-route-metric.network
View File

@ -5,6 +5,6 @@ Name=veth99
DHCP=ipv4
IPv6AcceptRA=false
[DHCP]
[DHCPv4]
UseRoutes=true
RouteMetric=24

2
test/test-network/conf/dhcp-client-route-table.network
View File

@ -5,6 +5,6 @@ Name=veth99
DHCP=ipv4
IPv6AcceptRA=false
[DHCP]
[DHCPv4]
UseRoutes=true
RouteTable=12

2
test/test-network/conf/dhcp-client-timezone-router.network
View File

@ -5,6 +5,6 @@ Name=veth99
IPv6AcceptRA=false
DHCP=ipv4
[DHCP]
[DHCPv4]
UseRoutes=true
UseTimezone=true

2
test/test-network/conf/dhcp-client-use-dns-ipv4-and-ra.network
View File

@ -4,7 +4,7 @@ Name=veth99
[Network]
DHCP=ipv4
[DHCP]
[DHCPv4]
UseDNS=yes
[IPv6AcceptRA]

5
test/test-network/conf/dhcp-client-use-dns-no.network
View File

@ -4,7 +4,10 @@ Name=veth99
[Network]
DHCP=yes
[DHCP]
[DHCPv4]
UseDNS=no
[DHCPv6]
UseDNS=no
[IPv6AcceptRA]

5
test/test-network/conf/dhcp-client-use-dns-yes.network
View File

@ -4,7 +4,10 @@ Name=veth99
[Network]
DHCP=yes
[DHCP]
[DHCPv4]
UseDNS=yes
[DHCPv6]
UseDNS=yes
[IPv6AcceptRA]

2
test/test-network/conf/dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network
View File

@ -6,5 +6,5 @@ DHCP=ipv4
LinkLocalAddressing=fallback
IPv6AcceptRA=no
[DHCP]
[DHCPv4]
MaxAttempts=1

4
test/test-network/systemd-networkd-tests.py
View File

@ -2538,10 +2538,6 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
start_dnsmasq('--dhcp-alternate-port=67,5555')
self.wait_online(['veth99:routable', 'veth-peer:routable'])
# link become 'routable' when at least one protocol provide an valid address.
self.wait_address('veth99', r'inet 192.168.5.[0-9]*/24 brd 192.168.5.255 scope global dynamic', ipv='-4')
self.wait_address('veth99', r'inet6 2600::[0-9a-f]*/128 scope global (?:dynamic noprefixroute|noprefixroute dynamic)', ipv='-6')
output = check_output('ip -4 address show dev veth99')
print(output)
self.assertRegex(output, '192.168.5.* dynamic')