system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-01 07:34:28 +00:00
Code Issues Projects Releases Wiki Activity

network: make generated configs have higher precedence over default configs

Browse Source 
We use 80- for default .network files. So, the generated files from the
kernel command line should have smaller prefix.
This commit is contained in:
Yu Watanabe 2023-11-02 13:41:30 +09:00
parent 71164ee9fe
commit b94f59b9d5
7 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/generator/main.c
View File

@ -33,7 +33,7 @@ static int network_save(Network *network, const char *dest_dir) {
if (asprintf(&p, "%s/%s-%s.network",
dest_dir,
isempty(network->ifname) ? "91" : "90",
isempty(network->ifname) ? "71" : "70",
isempty(network->ifname) ? "default" : network->ifname) < 0)
return log_oom();
@ -59,7 +59,7 @@ static int netdev_save(NetDev *netdev, const char *dest_dir) {
netdev_dump(netdev, f);
if (asprintf(&p, "%s/90-%s.netdev", dest_dir, netdev->ifname) < 0)
if (asprintf(&p, "%s/70-%s.netdev", dest_dir, netdev->ifname) < 0)
return log_oom();
r = conservative_rename(temp_path, p);
@ -86,7 +86,7 @@ static int link_save(Link *link, const char *dest_dir) {
if (asprintf(&p, "%s/%s-%s.link",
dest_dir,
!isempty(link->ifname) ? "90" : !hw_addr_is_null(&link->mac) ? "91" : "92",
!isempty(link->ifname) ? "70" : !hw_addr_is_null(&link->mac) ? "71" : "72",
link->filename) < 0)
return log_oom();

0
test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network → test/test-network-generator-conversion/test-01-dhcp.expected/71-default.network
View File

0
test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev → test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.netdev
View File

0
test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network → test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.network
View File

0
test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network → test/test-network-generator-conversion/test-02-bridge.expected/70-eth0.network
View File

0
test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network → test/test-network-generator-conversion/test-02-bridge.expected/70-eth1.network
View File

0
test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network → test/test-network-generator-conversion/test-03-issue-14319.expected/70-enp3s0.network
View File