dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28646 from yuwata/network-generator-ip-dhcp

Browse Source 
network-generator: make ip=dhcp works with container manager
This commit is contained in:
Yu Watanabe
2023-08-03 05:48:58 +09:00
committed by GitHub
parent 213ddf2d05 c25aa6c8ac
commit 28fd786bf5
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1108,10 +1108,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"

2
src/network/meson.build
View File

@@ -236,8 +236,8 @@ test_network_base = {
tests += [
{
'sources' : files(
'generator/test-network-generator.c',
'generator/network-generator.c',
'generator/test-network-generator.c'
)
},
{

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]