network-generator: rename generated unit files

The tool may be used in the initrd-less systems.

diff --git a/src/network/generator/main.c b/src/network/generator/main.c
index f5f9b04afc18402ddccd29bcf3e6c496d7bd49fe..52014aa8bef42e08668e65070a790ac0f9046439 100644 (file)
--- a/src/network/generator/main.c
+++ b/src/network/generator/main.c
@@ -22,8 +22,8 @@ static int network_save(Network *network, const char *dest_dir) {
 
         assert(network);
 
-        r = asprintf(&filename, "%s-initrd-%s.network",
-                     isempty(network->ifname) ? "99" : "98",
+        r = asprintf(&filename, "%s-%s.network",
+                     isempty(network->ifname) ? "91" : "90",
                      isempty(network->ifname) ? "default" : network->ifname);
         if (r < 0)
                 return log_oom();
@@ -44,7 +44,7 @@ static int netdev_save(NetDev *netdev, const char *dest_dir) {
 
         assert(netdev);
 
-        r = asprintf(&filename, "98-initrd-%s.netdev",
+        r = asprintf(&filename, "90-%s.netdev",
                      netdev->ifname);
         if (r < 0)
                 return log_oom();
@@ -65,7 +65,7 @@ static int link_save(Link *link, const char *dest_dir) {
 
         assert(link);
 
-        r = asprintf(&filename, "98-initrd-%s.link",
+        r = asprintf(&filename, "90-%s.link",
                      link->ifname);
         if (r < 0)
                 return log_oom();

diff --git a/test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/99-initrd-default.network b/test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/91-default.network
similarity index 100%
rename from test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/99-initrd-default.network
rename to test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/91-default.network

diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.netdev b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.netdev
similarity index 100%
rename from test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.netdev
rename to test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.netdev

diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.network
similarity index 100%
rename from test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.network
rename to test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.network

diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth0.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth0.network
similarity index 100%
rename from test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth0.network
rename to test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth0.network

diff --git a/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth1.network b/test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth1.network
similarity index 100%
rename from test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth1.network
rename to test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth1.network