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/71-default.network b/test/test-network-generator-conversion/test-01-dhcp.expected/71-default.network
new file mode 100644 (file)
index 0000000..657cde7
--- /dev/null
+++ b/test/test-network-generator-conversion/test-01-dhcp.expected/71-default.network
@@ -0,0 +1,12 @@
+# Automatically generated by systemd-network-generator
+
+[Match]
+Kind=!*
+Type=!loopback
+
+[Link]
+
+[Network]
+DHCP=ipv4
+
+[DHCP]

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/91-default.network
deleted file mode 100644 (file)
index 657cde7..0000000
--- a/test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network
+++ /dev/null
@@ -1,12 +0,0 @@
-# Automatically generated by systemd-network-generator
-
-[Match]
-Kind=!*
-Type=!loopback
-
-[Link]
-
-[Network]
-DHCP=ipv4
-
-[DHCP]

diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.netdev b/test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.netdev
new file mode 100644 (file)
index 0000000..97c2248
--- /dev/null
+++ b/test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.netdev
@@ -0,0 +1,5 @@
+# Automatically generated by systemd-network-generator
+
+[NetDev]
+Kind=bridge
+Name=bridge99

diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.network b/test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.network
new file mode 100644 (file)
index 0000000..f8d19ba
--- /dev/null
+++ b/test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.network
@@ -0,0 +1,13 @@
+# Automatically generated by systemd-network-generator
+
+[Match]
+Name=bridge99
+
+[Link]
+MACAddress=00:11:22:33:44:55
+MTUBytes=1530
+
+[Network]
+DHCP=ipv4
+
+[DHCP]

diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/70-eth0.network b/test/test-network-generator-conversion/test-02-bridge.expected/70-eth0.network
new file mode 100644 (file)
index 0000000..c076804
--- /dev/null
+++ b/test/test-network-generator-conversion/test-02-bridge.expected/70-eth0.network
@@ -0,0 +1,23 @@
+# Automatically generated by systemd-network-generator
+
+[Match]
+Name=eth0
+
+[Link]
+
+[Network]
+DHCP=no
+LinkLocalAddressing=no
+IPv6AcceptRA=no
+DNS=10.10.10.10
+DNS=10.10.10.11
+Bridge=bridge99
+
+[DHCP]
+Hostname=hogehoge
+
+[Address]
+Address=192.168.0.10/24
+
+[Route]
+Gateway=192.168.0.1

diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/70-eth1.network b/test/test-network-generator-conversion/test-02-bridge.expected/70-eth1.network
new file mode 100644 (file)
index 0000000..c7dcf7b
--- /dev/null
+++ b/test/test-network-generator-conversion/test-02-bridge.expected/70-eth1.network
@@ -0,0 +1,23 @@
+# Automatically generated by systemd-network-generator
+
+[Match]
+Name=eth1
+
+[Link]
+
+[Network]
+DHCP=no
+LinkLocalAddressing=no
+IPv6AcceptRA=no
+DNS=10.10.10.10
+DNS=10.10.10.11
+Bridge=bridge99
+
+[DHCP]
+Hostname=hogehoge
+
+[Address]
+Address=192.168.0.11/24
+
+[Route]
+Gateway=192.168.0.1

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/90-bridge99.netdev
deleted file mode 100644 (file)
index 97c2248..0000000
--- a/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically generated by systemd-network-generator
-
-[NetDev]
-Kind=bridge
-Name=bridge99

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/90-bridge99.network
deleted file mode 100644 (file)
index f8d19ba..0000000
--- a/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated by systemd-network-generator
-
-[Match]
-Name=bridge99
-
-[Link]
-MACAddress=00:11:22:33:44:55
-MTUBytes=1530
-
-[Network]
-DHCP=ipv4
-
-[DHCP]

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/90-eth0.network
deleted file mode 100644 (file)
index c076804..0000000
--- a/test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network
+++ /dev/null
@@ -1,23 +0,0 @@
-# Automatically generated by systemd-network-generator
-
-[Match]
-Name=eth0
-
-[Link]
-
-[Network]
-DHCP=no
-LinkLocalAddressing=no
-IPv6AcceptRA=no
-DNS=10.10.10.10
-DNS=10.10.10.11
-Bridge=bridge99
-
-[DHCP]
-Hostname=hogehoge
-
-[Address]
-Address=192.168.0.10/24
-
-[Route]
-Gateway=192.168.0.1

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/90-eth1.network
deleted file mode 100644 (file)
index c7dcf7b..0000000
--- a/test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network
+++ /dev/null
@@ -1,23 +0,0 @@
-# Automatically generated by systemd-network-generator
-
-[Match]
-Name=eth1
-
-[Link]
-
-[Network]
-DHCP=no
-LinkLocalAddressing=no
-IPv6AcceptRA=no
-DNS=10.10.10.10
-DNS=10.10.10.11
-Bridge=bridge99
-
-[DHCP]
-Hostname=hogehoge
-
-[Address]
-Address=192.168.0.11/24
-
-[Route]
-Gateway=192.168.0.1

diff --git a/test/test-network-generator-conversion/test-03-issue-14319.expected/70-enp3s0.network b/test/test-network-generator-conversion/test-03-issue-14319.expected/70-enp3s0.network
new file mode 100644 (file)
index 0000000..ad04193
--- /dev/null
+++ b/test/test-network-generator-conversion/test-03-issue-14319.expected/70-enp3s0.network
@@ -0,0 +1,19 @@
+# Automatically generated by systemd-network-generator
+
+[Match]
+Name=enp3s0
+
+[Link]
+
+[Network]
+DHCP=no
+LinkLocalAddressing=no
+IPv6AcceptRA=no
+
+[DHCP]
+
+[Address]
+Address=10.99.37.44/16
+
+[Route]
+Gateway=10.99.10.1

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/90-enp3s0.network
deleted file mode 100644 (file)
index ad04193..0000000
--- a/test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network
+++ /dev/null
@@ -1,19 +0,0 @@
-# Automatically generated by systemd-network-generator
-
-[Match]
-Name=enp3s0
-
-[Link]
-
-[Network]
-DHCP=no
-LinkLocalAddressing=no
-IPv6AcceptRA=no
-
-[DHCP]
-
-[Address]
-Address=10.99.37.44/16
-
-[Route]
-Gateway=10.99.10.1