shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

Merge pull request #13189 from yuwata/network-initrd-generator-unit

Browse Source 
unit: update initrd-network-generator.service
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-07-30 16:38:59 +02:00 committed by GitHub
commit 9f4afc0154
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/generator/main.c
View File

@ -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();

0
test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/99-initrd-default.network → test/TEST-35-NETWORK-GENERATOR/test-01-dhcp.expected/91-default.network
View File

0
test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.netdev → test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.netdev
View File

0
test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-bridge99.network → test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-bridge99.network
View File

0
test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth0.network → test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth0.network
View File

0
test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/98-initrd-eth1.network → test/TEST-35-NETWORK-GENERATOR/test-02-bridge.expected/90-eth1.network
View File

2
units/meson.build
View File

@ -119,7 +119,6 @@ in_units = [
['debug-shell.service', ''],
['emergency.service', ''],
['initrd-cleanup.service', ''],
['initrd-network-generator.service', 'ENABLE_NETWORKD'],
['initrd-parse-etc.service', ''],
['initrd-switch-root.service', ''],
['initrd-udevadm-cleanup-db.service', ''],
@ -175,6 +174,7 @@ in_units = [
'dbus-org.freedesktop.machine1.service'],
['systemd-modules-load.service', 'HAVE_KMOD',
'sysinit.target.wants/'],
['systemd-network-generator.service', 'ENABLE_NETWORKD'],
['systemd-networkd.service', 'ENABLE_NETWORKD'],
['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD'],
['systemd-nspawn@.service', ''],

5
units/initrd-network-generator.service.in → units/systemd-network-generator.service.in
View File

@ -10,8 +10,11 @@
[Unit]
Description=Generate network units from Kernel command line
DefaultDependencies=no
Before=network-pre.target initrd-root-device.target initrd-root-fs.target initrd.target
Before=network-pre.target
[Service]
Type=oneshot
ExecStart=@rootlibexecdir@/systemd-network-generator
[Install]
WantedBy=network-pre.target