diff options
| -rw-r--r-- | src/network/generator/main.c | 6 | ||||
| -rw-r--r-- | test/test-network-generator-conversion/test-01-dhcp.expected/71-default.network (renamed from test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network) | 0 | ||||
| -rw-r--r-- | test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.netdev (renamed from test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev) | 0 | ||||
| -rw-r--r-- | test/test-network-generator-conversion/test-02-bridge.expected/70-bridge99.network (renamed from test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network) | 0 | ||||
| -rw-r--r-- | test/test-network-generator-conversion/test-02-bridge.expected/70-eth0.network (renamed from test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network) | 0 | ||||
| -rw-r--r-- | test/test-network-generator-conversion/test-02-bridge.expected/70-eth1.network (renamed from test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network) | 0 | ||||
| -rw-r--r-- | test/test-network-generator-conversion/test-03-issue-14319.expected/70-enp3s0.network (renamed from test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network) | 0 |
7 files changed, 3 insertions, 3 deletions
diff --git a/src/network/generator/main.c b/src/network/generator/main.c index 3456fc4cf8..0439a9d769 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 index 657cde79ae..657cde79ae 100644 --- 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 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 index 97c22485b7..97c22485b7 100644 --- 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 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 index f8d19baaea..f8d19baaea 100644 --- 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 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 index c076804bdc..c076804bdc 100644 --- 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 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 index c7dcf7bd28..c7dcf7bd28 100644 --- 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 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 index ad04193bed..ad04193bed 100644 --- 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 |