meson.version

@@ -1 +1 @@
-257.8
+257.7

test/units/TEST-23-UNIT-FILE.verify-unit-files.sh

@@ -41,12 +41,5 @@ for unit_file in "${UNIT_FILES[@]}"; do
         continue
     fi
 
-    # Skip masked unit files
-    resolved=$(readlink -f "$unit_file")
-    if [[ "$resolved" == "/dev/null" || "$(systemctl is-enabled "${resolved##*/}" 2>/dev/null || :)" == "masked" ]]; then
-        echo "$unit_file is masked, skipping"
-        continue
-    fi
-
     systemd-analyze --recursive-errors=no --man=no verify "$unit_file"
 done

test/units/TEST-64-UDEV-STORAGE.sh

@@ -1259,9 +1259,7 @@ EOF
 
     # Clear superblocks to make the MD device will not be restarted even if the VM is restarted.
     # This is a workaround for issue #38240.
-    udevadm settle --timeout=30
+    mdadm -v --zero-superblock --force "${devices[@]}"
-    # shellcheck disable=SC2046
-    mdadm -v --zero-superblock --force $(readlink -f "${devices[@]}")
     udevadm settle --timeout=30
 
     # Check if all expected symlinks were removed after the cleanup
@@ -1324,9 +1322,7 @@ testcase_mdadm_lvm() {
 
     # Clear superblocks to make the MD device will not be restarted even if the VM is restarted.
     # This is a workaround for issue #38240.
-    udevadm settle --timeout=30
+    mdadm -v --zero-superblock --force "${devices[@]}"
-    # shellcheck disable=SC2046
-    mdadm -v --zero-superblock --force $(readlink -f "${devices[@]}")
     udevadm settle --timeout=30
 
     # Check if all expected symlinks were removed after the cleanup

test/units/TEST-74-AUX-UTILS.run.sh

@@ -280,4 +280,4 @@ if [[ -e /usr/lib/pam.d/systemd-run0 ]] || [[ -e /etc/pam.d/systemd-run0 ]]; the
 fi
 
 # Tests whether intermediate disconnects corrupt us (modified testcase from https://github.com/systemd/systemd/issues/27204)
-assert_rc "37" timeout 300 systemd-run --unit=disconnecttest --wait --pipe --user -M testuser@.host bash -ec 'systemctl --user daemon-reexec; sleep 3; exit 37'
+assert_rc "37" systemd-run --unit=disconnecttest --wait --pipe --user -M testuser@.host bash -ec 'systemctl --user daemon-reexec; sleep 3; exit 37'

units/systemd-oomd.service.in

@@ -20,7 +20,7 @@ ConditionPathExists=/proc/pressure/cpu
 ConditionPathExists=/proc/pressure/io
 ConditionPathExists=/proc/pressure/memory
 Requires=systemd-oomd.socket
-After=systemd-oomd.socket systemd-sysusers.service
+After=systemd-oomd.socket
 
 [Service]
 AmbientCapabilities=CAP_KILL CAP_DAC_OVERRIDE