diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-12-16 15:50:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-16 15:50:39 +0000 |
| commit | c6837e4e86d876cba3102ab1ba1e544237c3beb8 (patch) | |
| tree | 58067bb21cff75ce5b6dd5c6a2a38f0952a1b8e0 | |
| parent | 4bb3437cad715c40c1a183adbb3a7687ec6f6ac6 (diff) | |
| parent | 66aaca688f46e1c33016f88d94cc1647f53ddf6e (diff) | |
| download | systemd-c6837e4e86d876cba3102ab1ba1e544237c3beb8.tar.gz | |
Merge pull request #21790 from keszybz/network-generator-always
Enable systemd-network-generator by default
| -rw-r--r-- | man/systemd-udevd.service.xml | 15 | ||||
| -rw-r--r-- | presets/90-systemd.preset | 2 | ||||
| -rw-r--r-- | units/systemd-networkd.service.in | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index 1bc86469be..3107fb7ce9 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -234,13 +234,14 @@ <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry> for more details. When the MAC address is specified, the policies are applied to the interface which has the address. When no MAC address is specified, the policies are applied - to all interfaces. This kernel command line argument can be specified multiple times. This - argument is not directly read from <command>systemd-udevd</command>, but read and converted - to a .link file by <command>systemd-network-generator</command>. So, to make this argument - take effect, <filename>systemd-network-generator.service</filename> must be enabled and - started before starting <filename>systemd-udevd.service</filename>. See - <citerefentry><refentrytitle>systemd-network-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> - for more details about the service.</para> + to all interfaces. This kernel command line argument can be specified multiple times.</para> + + <para>This argument is not directly read by <command>systemd-udevd</command>, but is instead + converted to a .link file by + <citerefentry><refentrytitle>systemd-network-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. + For this argument to take effect, <filename>systemd-network-generator.service</filename> must be + enabled.</para> + <para>Example: <programlisting>net.ifname-policy=keep,kernel,path,slot,onboard,01:23:45:67:89:ab net.ifname-policy=keep,kernel,path,slot,onboard,mac</programlisting> 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 |