From e2e05a0e4ab9bdff9df2b198808b2d3227af1f41 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 30 Jul 2019 00:58:00 +0900 Subject: [PATCH] unit: rename initrd-network-generator.service -> systemd-network-generator.service --- units/meson.build | 2 +- ...rator.service.in => systemd-network-generator.service.in} | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) rename units/{initrd-network-generator.service.in => systemd-network-generator.service.in} (85%) 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 similarity index 85% rename from units/initrd-network-generator.service.in rename to 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