shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-15 05:57:26 +03:00
Code

network-generator: make network file generated from ip=dhcp matches only physical interfaces

Browse Source 
Otherwise, it also matches later created virtual devices, and that
breaks networks generated and managed by container management services,
like docker.

Closes #28626.

(cherry picked from commit c25aa6c8acc6d95eaacae7858a7057907d61a25e)
(cherry picked from commit d39bfd26d47793fc95aabfd9ff4f32e8d63d1021)
(cherry picked from commit 2c2b89aeded6aa34526a7d1a59232e7bd7495f40)
This commit is contained in:
Yu Watanabe 2023-08-03 02:12:10 +09:00 committed by Luca Boccassi
parent b2b8156575
commit 0efa20c2ee
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/generator/network-generator.c
View File

@ -1107,10 +1107,15 @@ void network_dump(Network *network, FILE *f) {
assert(network);
assert(f);
fprintf(f,
"[Match]\n"
"Name=%s\n",
isempty(network->ifname) ? "*" : network->ifname);
fputs("[Match]\n", f);
if (isempty(network->ifname))
/* If the interface name is not specified, then let's make the .network file match the all
* physical interfaces. */
fputs("Kind=!*\n"
"Type=!loopback\n", f);
else
fprintf(f, "Name=%s\n", network->ifname);
fputs("\n[Link]\n", f);

15
src/network/generator/test-network-generator.c
View File

@ -65,7 +65,8 @@ static void test_link_one(const char *filename, const char *key, const char *val
int main(int argc, char *argv[]) {
test_network_one("", "ip", "dhcp6",
"[Match]\n"
"Name=*\n"
"Kind=!*\n"
"Type=!loopback\n"
"\n[Link]\n"
"\n[Network]\n"
"DHCP=ipv6\n"
@ -228,7 +229,8 @@ int main(int argc, char *argv[]) {
test_network_one("", "rd.route", "10.1.2.3/16:10.0.2.3",
"[Match]\n"
"Name=*\n"
"Kind=!*\n"
"Type=!loopback\n"
"\n[Link]\n"
"\n[Network]\n"
"\n[DHCP]\n"
@ -250,7 +252,8 @@ int main(int argc, char *argv[]) {
test_network_one("", "nameserver", "10.1.2.3",
"[Match]\n"
"Name=*\n"
"Kind=!*\n"
"Type=!loopback\n"
"\n[Link]\n"
"\n[Network]\n"
"DNS=10.1.2.3\n"
@ -259,7 +262,8 @@ int main(int argc, char *argv[]) {
test_network_one("", "rd.peerdns", "0",
"[Match]\n"
"Name=*\n"
"Kind=!*\n"
"Type=!loopback\n"
"\n[Link]\n"
"\n[Network]\n"
"\n[DHCP]\n"
@ -268,7 +272,8 @@ int main(int argc, char *argv[]) {
test_network_one("", "rd.peerdns", "1",
"[Match]\n"
"Name=*\n"
"Kind=!*\n"
"Type=!loopback\n"
"\n[Link]\n"
"\n[Network]\n"
"\n[DHCP]\n"

3
test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network
View File

@ -1,7 +1,8 @@
# Automatically generated by systemd-network-generator
[Match]
Name=*
Kind=!*
Type=!loopback
[Link]