summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-12-16 09:46:26 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-12-16 09:49:39 +0100
commite053f49272e46c2ba941cbd3fd8bf07b089b2917 (patch)
tree798546466ea50c9bd35f548403734642aa5e23a5
parent79463de5336ad8aafd7e66235e907cc584b7b649 (diff)
downloadsystemd-e053f49272e46c2ba941cbd3fd8bf07b089b2917.tar.gz
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.
-rw-r--r--presets/90-systemd.preset2
-rw-r--r--units/systemd-networkd.service.in4
2 files changed, 5 insertions, 1 deletions
diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
index 8a1a08210c..25936d8f57 100644
--- 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 6acce036df..95dd2665b2 100644
--- 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