morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commits 112a41b6ec,
3178698bb5, and
b768379e8b.

The commit 112a41b6ec 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:
Yu Watanabe
2023-08-11 13:45:25 +09:00
parent 82ee54b2d8
commit 12aac8ea45
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/units/testsuite-17.00.sh
View File

@@ -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

2
units/systemd-tmpfiles-setup.service
View File

@@ -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