Revert "unit: make udev rules really take precedence over tmpfiles"

This reverts commits 112a41b6ece19d03e951d886fe2f26512ab31fab,
3178698bb5352989e4bff866641838b1c2a0efcb, and
b768379e8b494b025f41946205944a6f3a1a553f.

The commit 112a41b6ece19d03e951d886fe2f26512ab31fab introduces #28765,
as systemd-tmpfiles-setup.service has ordering after local-fs.target,
but usually the target requires block devices processed by udevd.
Hence, the service can only start after the block devices timed out.

Fixes #28765.

diff --git a/test/units/testsuite-17.00.sh b/test/units/testsuite-17.00.sh
deleted file mode 100755 (executable)
index a72c0fb..0000000
--- a/test/units/testsuite-17.00.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -ex
-set -o pipefail
-
-# shellcheck source=test/units/util.sh
-. "$(dirname "$0")"/util.sh
-
-# Tests for issue #28588 and #28653.
-
-assert_in "systemd-tmpfiles-setup-dev.service" "$(systemctl show --property After --value systemd-udevd.service)"
-assert_in "systemd-udevd.service" "$(systemctl show --property Before --value systemd-tmpfiles-setup-dev.service)"
-
-assert_in "systemd-tmpfiles-setup.service" "$(systemctl show --property After --value systemd-udevd.service)"
-assert_in "systemd-udevd.service" "$(systemctl show --property Before --value systemd-tmpfiles-setup.service)"
-
-if [[ -f /dev/vfio/vfio ]]; then
-   assert_in "crw-rw-rw-" "$(stat --format=%A /dev/vfio/vfio)"
-fi
-
-exit 0

diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service
index 2e04733a5d1d56987f9e579cb2d9862491ef4e28..6c5e3de8fd96248ea0c8c3594e826f914d1c6054 100644 (file)
--- a/units/systemd-tmpfiles-setup.service
+++ b/units/systemd-tmpfiles-setup.service
@@ -13,7 +13,7 @@ Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
 
 DefaultDependencies=no
 After=local-fs.target systemd-sysusers.service systemd-journald.service
-Before=sysinit.target systemd-udevd.service
+Before=sysinit.target
 Conflicts=shutdown.target initrd-switch-root.target
 Before=shutdown.target initrd-switch-root.target
 RefuseManualStop=yes