summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-07-30 00:58:00 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-07-30 02:30:09 +0900
commite2e05a0e4ab9bdff9df2b198808b2d3227af1f41 (patch)
tree17cee027107415eef1cb823e5dc104f7b532d250
parente8d456fba8423a3f840fa488f531c4b4e46b5624 (diff)
downloadsystemd-e2e05a0e4ab9bdff9df2b198808b2d3227af1f41.tar.gz
unit: rename initrd-network-generator.service -> systemd-network-generator.service
-rw-r--r--units/meson.build2
-rw-r--r--units/systemd-network-generator.service.in (renamed from units/initrd-network-generator.service.in)5
2 files changed, 5 insertions, 2 deletions
diff --git a/units/meson.build b/units/meson.build
index 5d2f723a70..cf4fe2e7bf 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -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', ''],
diff --git a/units/initrd-network-generator.service.in b/units/systemd-network-generator.service.in
index f9261961b7..e314aded9b 100644
--- a/units/initrd-network-generator.service.in
+++ b/units/systemd-network-generator.service.in
@@ -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