mirror of
https://github.com/systemd/systemd
synced 2024-07-22 10:44:58 +00:00
Revert "unit: make udev rules really take precedence over tmpfiles"
This reverts commits112a41b6ec
,3178698bb5
, andb768379e8b
. The commit112a41b6ec
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.
This commit is contained in:
parent
82ee54b2d8
commit
12aac8ea45
|
@ -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
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue