diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-30 00:50:19 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-30 02:30:09 +0900 |
| commit | e8d456fba8423a3f840fa488f531c4b4e46b5624 (patch) | |
| tree | bca586f330ca09155e0b80e3bd92192ce1660fe1 | |
| parent | 1d7458fbb1b09ebbfdcf775909e09c56d6a6023e (diff) | |
| download | systemd-e8d456fba8423a3f840fa488f531c4b4e46b5624.tar.gz | |
network-generator: rename generated unit files
The tool may be used in the initrd-less systems.
| -rw-r--r-- | src/network/generator/main.c | 8 | ||||
| -rw-r--r-- | test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/91-default.network (renamed from test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/99-initrd-default.network) | 0 | ||||
| -rw-r--r-- | test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.netdev (renamed from test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.netdev) | 0 | ||||
| -rw-r--r-- | test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.network (renamed from test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.network) | 0 | ||||
| -rw-r--r-- | test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth0.network (renamed from test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth0.network) | 0 | ||||
| -rw-r--r-- | test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth1.network (renamed from test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth1.network) | 0 |
6 files changed, 4 insertions, 4 deletions
diff --git a/src/network/generator/main.c b/src/network/generator/main.c index f5f9b04afc..52014aa8be 100644 --- 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 index e42ce1e311..e42ce1e311 100644 --- 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 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 index 97c22485b7..97c22485b7 100644 --- 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 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 index f8d19baaea..f8d19baaea 100644 --- 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 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 index 8842b57921..8842b57921 100644 --- 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 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 index feff4f5ba8..feff4f5ba8 100644 --- 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 |