diff --git a/test/units/testsuite-17.00.sh b/test/units/testsuite-17.00.sh deleted file mode 100755 index a72c0fb792..0000000000 --- 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 2e04733a5d..6c5e3de8fd 100644 --- 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