unit: rename initrd-network-generator.service -> systemd-network-generator.service

diff --git a/units/meson.build b/units/meson.build
index 5d2f723a70f30b1fb5834cce6762c79d5f70a20a..cf4fe2e7bfb809e90798ed914ba887109a130407 100644 (file)
--- 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 f9261961b7a26cd73734b09dfdb11686215d507a..e314aded9b326860c7c12dc332120077b70c5106 100644 (file)
--- 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