From b94f59b9d56b1ce6352bda54803f2ee1c503f574 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 2 Nov 2023 13:41:30 +0900 Subject: [PATCH] network: make generated configs have higher precedence over default configs We use 80- for default .network files. So, the generated files from the kernel command line should have smaller prefix. --- src/network/generator/main.c | 6 +++--- .../{91-default.network => 71-default.network} | 0 .../{90-bridge99.netdev => 70-bridge99.netdev} | 0 .../{90-bridge99.network => 70-bridge99.network} | 0 .../{90-eth0.network => 70-eth0.network} | 0 .../{90-eth1.network => 70-eth1.network} | 0 .../{90-enp3s0.network => 70-enp3s0.network} | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename test/test-network-generator-conversion/test-01-dhcp.expected/{91-default.network => 71-default.network} (100%) rename test/test-network-generator-conversion/test-02-bridge.expected/{90-bridge99.netdev => 70-bridge99.netdev} (100%) rename test/test-network-generator-conversion/test-02-bridge.expected/{90-bridge99.network => 70-bridge99.network} (100%) rename test/test-network-generator-conversion/test-02-bridge.expected/{90-eth0.network => 70-eth0.network} (100%) rename test/test-network-generator-conversion/test-02-bridge.expected/{90-eth1.network => 70-eth1.network} (100%) rename test/test-network-generator-conversion/test-03-issue-14319.expected/{90-enp3s0.network => 70-enp3s0.network} (100%) diff --git a/src/network/generator/main.c b/src/network/generator/main.c index 3456fc4cf80..0439a9d7697 100644 --- a/src/network/generator/main.c +++ b/src/network/generator/main.c @@ -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(); diff --git a/test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network b/test/test-network-generator-conversion/test-01-dhcp.expected/71-default.network similarity index 100% rename from test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network rename to test/test-network-generator-conversion/test-01-dhcp.expected/71-default.network diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev b/test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.netdev similarity index 100% rename from test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev rename to test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.netdev diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network b/test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.network similarity index 100% rename from test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network rename to test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.network diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network b/test/test-network-generator-conversion/test-02-bridge.expected/70-eth0.network similarity index 100% rename from test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network rename to test/test-network-generator-conversion/test-02-bridge.expected/70-eth0.network diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network b/test/test-network-generator-conversion/test-02-bridge.expected/70-eth1.network similarity index 100% rename from test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network rename to test/test-network-generator-conversion/test-02-bridge.expected/70-eth1.network diff --git a/test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network b/test/test-network-generator-conversion/test-03-issue-14319.expected/70-enp3s0.network similarity index 100% rename from test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network rename to test/test-network-generator-conversion/test-03-issue-14319.expected/70-enp3s0.network -- 2.39.2