units: enable systemd-network-generator by default

It is used by udevd and networkd. Since udevd is enabled statically, let's also
change the preset to "on". networkd is opt-in, so let's pull in the generator
when enabling networkd too.

diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index 8a1a08210cfe269be1bc54c0c06635e7c2295927..25936d8f57ebff58cb4cfbe5daf4a8320969bc6a 100644 (file)
--- a/presets/90-systemd.preset
+++ b/presets/90-systemd.preset
@@ -18,6 +18,7 @@ enable machines.target
 enable getty@.service
 enable systemd-timesyncd.service
 enable systemd-networkd.service
+enable systemd-network-generator.service
 enable systemd-resolved.service
 enable systemd-homed.service
 enable systemd-userdbd.socket
@@ -37,7 +38,6 @@ disable exit.target
 disable systemd-networkd-wait-online.service
 disable systemd-time-wait-sync.service
 disable systemd-boot-check-no-failures.service
-disable systemd-network-generator.service
 disable proc-sys-fs-binfmt_misc.mount
 
 disable syslog.socket

diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index 6acce036dfda9f586e2526562883da18463bd844..95dd2665b28132713635e713897e8eb8ae62ba36 100644 (file)
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -56,6 +56,10 @@ WantedBy=multi-user.target
 Also=systemd-networkd.socket
 Alias=dbus-org.freedesktop.network1.service
 
+# The output from this generator is used by udevd and networkd. Enable it by
+# default when enabling systemd-networkd.service.
+Also=systemd-network-generator.service
+
 # We want to enable systemd-networkd-wait-online.service whenever this service
 # is enabled. systemd-networkd-wait-online.service has
 # WantedBy=network-online.target, so enabling it only has an effect if