diff options
| -rw-r--r-- | man/systemd-udevd.service.xml | 15 | ||||
| -rw-r--r-- | presets/90-systemd.preset | 2 | ||||
| -rwxr-xr-x | test/TEST-64-UDEV-STORAGE/test.sh | 8 | ||||
| -rwxr-xr-x | test/units/testsuite-64.sh | 2 | ||||
| -rw-r--r-- | units/systemd-networkd.service.in | 4 |
5 files changed, 21 insertions, 10 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/test/TEST-64-UDEV-STORAGE/test.sh b/test/TEST-64-UDEV-STORAGE/test.sh index d9abfc5d95..0f26eaafeb 100755 --- a/test/TEST-64-UDEV-STORAGE/test.sh +++ b/test/TEST-64-UDEV-STORAGE/test.sh @@ -215,7 +215,7 @@ testcase_virtio_scsi_identically_named_partitions() { # and attach them to a virtio-scsi controller local qemu_opts=("-device virtio-scsi-pci,id=scsi0,num_queues=4") local diskpath="${TESTDIR:?}/namedpart0.img" - local lodev + local lodev qemu_timeout dd if=/dev/zero of="$diskpath" bs=1M count=18 lodev="$(losetup --show -f -P "$diskpath")" @@ -245,10 +245,14 @@ EOF ) done + # Bump the timeout when collecting test coverage, since the test is a bit + # slower in that case + is_built_with_coverage && qemu_timeout=120 || qemu_timeout=60 + KERNEL_APPEND="systemd.setenv=TEST_FUNCTION_NAME=${FUNCNAME[0]} ${USER_KERNEL_APPEND:-}" # Limit the number of VCPUs and set a timeout to make sure we trigger the issue QEMU_OPTIONS="${qemu_opts[*]} ${USER_QEMU_OPTIONS:-}" - QEMU_SMP=1 QEMU_TIMEOUT=60 test_run_one "${1:?}" || return $? + QEMU_SMP=1 QEMU_TIMEOUT=$qemu_timeout test_run_one "${1:?}" || return $? rm -f "${TESTDIR:?}"/namedpart*.img } diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh index d41e807ef5..f75382d90a 100755 --- a/test/units/testsuite-64.sh +++ b/test/units/testsuite-64.sh @@ -673,6 +673,8 @@ testcase_long_sysfs_path() { swapon -v -L swap_vol swapoff -v -L swap_vol + udevadm settle + logfile="$(mktemp)" journalctl -b -q --no-pager -o short-monotonic -p info --grep "Device path.*vda.?' too long to fit into unit name" # Make sure we don't unnecessarily spam the log 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 |