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.

diff --git a/src/network/generator/main.c b/src/network/generator/main.c
index 3456fc4cf80cad636eb268e0dfa8012f366b8ef7..0439a9d7697ea7b35cb2858f89884d136263b355 100644 (file)
--- 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