Version in base suite: 252.17-1~deb12u1 Base version: systemd_252.17-1~deb12u1 Target version: systemd_252.18-1~deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/s/systemd/systemd_252.17-1~deb12u1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/s/systemd/systemd_252.18-1~deb12u1.dsc debian/changelog | 7 + debian/patches/debian/Don-t-enable-audit-by-default.patch | 4 debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch | 4 debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch | 2 debian/patches/p11kit-switch-to-dlopen.patch | 6 - hwdb.d/60-input-id.hwdb | 4 hwdb.d/60-keyboard.hwdb | 12 ++ hwdb.d/60-sensor.hwdb | 19 +++ hwdb.d/70-mouse.hwdb | 8 + hwdb.d/80-ieee1394-unit-function.hwdb | 54 ++++++++-- man/kernel-command-line.xml | 1 man/sd_bus_error_add_map.xml | 11 -- src/core/main.c | 2 src/journal/journald-server.c | 22 +--- src/network/networkd-sriov.c | 6 + src/shared/hwdb-util.c | 2 src/udev/udevd.c | 4 test/test-functions | 8 + 18 files changed, 133 insertions(+), 43 deletions(-) diff: /srv/release.debian.org/tmp/FFktxUJ2na/systemd-252.17/test/testdata: recursive directory loop diff -Nru systemd-252.17/debian/changelog systemd-252.18/debian/changelog --- systemd-252.17/debian/changelog 2023-09-20 12:15:14.000000000 +0000 +++ systemd-252.18/debian/changelog 2023-10-08 15:14:12.000000000 +0000 @@ -1,3 +1,10 @@ +systemd (252.18-1~deb12u1) bookworm; urgency=medium + + * New upstream version 252.18 + * Refresh patches + + -- Luca Boccassi Sun, 08 Oct 2023 16:14:12 +0100 + systemd (252.17-1~deb12u1) bookworm; urgency=medium * New upstream version 252.17. Fixes minor security issue in arm64 diff -Nru systemd-252.17/debian/patches/debian/Don-t-enable-audit-by-default.patch systemd-252.18/debian/patches/debian/Don-t-enable-audit-by-default.patch --- systemd-252.17/debian/patches/debian/Don-t-enable-audit-by-default.patch 2023-09-20 12:15:08.000000000 +0000 +++ systemd-252.18/debian/patches/debian/Don-t-enable-audit-by-default.patch 2023-10-08 15:14:01.000000000 +0000 @@ -29,10 +29,10 @@ diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index bced165..6356be2 100644 +index 3e55795..314f684 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c -@@ -2275,7 +2275,7 @@ int server_init(Server *s, const char *namespace) { +@@ -2273,7 +2273,7 @@ int server_init(Server *s, const char *namespace) { .compress.threshold_bytes = UINT64_MAX, .seal = true, diff -Nru systemd-252.17/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch systemd-252.18/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch --- systemd-252.17/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch 2023-09-20 12:15:08.000000000 +0000 +++ systemd-252.18/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch 2023-10-08 15:14:01.000000000 +0000 @@ -30,10 +30,10 @@ systemd.journald.forward_to_kmsg, systemd.journald.forward_to_console, and diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 6faf48d..bced165 100644 +index 4c5eadc..3e55795 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c -@@ -2285,6 +2285,7 @@ int server_init(Server *s, const char *namespace) { +@@ -2283,6 +2283,7 @@ int server_init(Server *s, const char *namespace) { .ratelimit_interval = DEFAULT_RATE_LIMIT_INTERVAL, .ratelimit_burst = DEFAULT_RATE_LIMIT_BURST, diff -Nru systemd-252.17/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch systemd-252.18/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch --- systemd-252.17/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch 2023-09-20 12:15:08.000000000 +0000 +++ systemd-252.18/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch 2023-10-08 15:14:01.000000000 +0000 @@ -19,7 +19,7 @@ 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/core/main.c b/src/core/main.c -index a84fafa..5e61df8 100644 +index c3b1a35..59ea0c6 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1650,24 +1650,6 @@ static void cmdline_take_random_seed(void) { diff -Nru systemd-252.17/debian/patches/p11kit-switch-to-dlopen.patch systemd-252.18/debian/patches/p11kit-switch-to-dlopen.patch --- systemd-252.17/debian/patches/p11kit-switch-to-dlopen.patch 2023-09-20 12:15:08.000000000 +0000 +++ systemd-252.18/debian/patches/p11kit-switch-to-dlopen.patch 2023-10-08 15:14:01.000000000 +0000 @@ -718,10 +718,10 @@ } diff --git a/test/test-functions b/test/test-functions -index 4bdd2a9..f0423dd 100644 +index f801d49..9b9ddcb 100644 --- a/test/test-functions +++ b/test/test-functions -@@ -1356,7 +1356,7 @@ install_missing_libraries() { +@@ -1360,7 +1360,7 @@ install_missing_libraries() { local lib path # A number of dependencies is now optional via dlopen, so the install # script will not pick them up, since it looks at linkage. @@ -730,7 +730,7 @@ ddebug "Searching for $lib via pkg-config" if pkg-config --exists "$lib"; then path="$(pkg-config --variable=libdir "$lib")" -@@ -1368,6 +1368,10 @@ install_missing_libraries() { +@@ -1372,6 +1372,10 @@ install_missing_libraries() { if ! [[ ${lib} =~ ^lib ]]; then lib="lib${lib}" fi diff -Nru systemd-252.17/hwdb.d/60-input-id.hwdb systemd-252.18/hwdb.d/60-input-id.hwdb --- systemd-252.17/hwdb.d/60-input-id.hwdb 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/hwdb.d/60-input-id.hwdb 2023-09-28 17:49:38.000000000 +0000 @@ -75,3 +75,7 @@ id-input:modalias:input:b0003v068Ep00F2e0100* ID_INPUT_ACCELEROMETER=0 ID_INPUT_JOYSTICK=1 + +# TEX Shinobi Trackpoint +id-input:modalias:input:b0003v04D9p0407e0111-e0,1,2,4* + ID_INPUT_POINTINGSTICK=1 diff -Nru systemd-252.17/hwdb.d/60-keyboard.hwdb systemd-252.18/hwdb.d/60-keyboard.hwdb --- systemd-252.17/hwdb.d/60-keyboard.hwdb 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/hwdb.d/60-keyboard.hwdb 2023-09-28 17:49:38.000000000 +0000 @@ -173,6 +173,10 @@ KEYBOARD_KEY_ce=unknown # Brightness Up, also emitted by acpi-video, ignore KEYBOARD_KEY_ef=unknown # Brightness Down, also emitted by acpi-video, ignore +# Predator PT314-52s +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnPredator*PT314-52s:pvr* + KEYBOARD_KEY_66=micmute # Microphone mute button + # Predator PH 315-52 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnPredator*PH*315-52:* KEYBOARD_KEY_ef=kbdillumup # Fn+F10 @@ -605,6 +609,11 @@ KEYBOARD_KEY_d9=unknown KEYBOARD_KEY_d2=sysrq # Fn+Print = SYSRQ +# Pavilion gaming 15-dk1* (lid keys) +evdev:atkbd:dmi:bvn*:bvr*:bd*:br*:efr*:svnHP:pnHPPavilionGamingLaptop15-dk1*:* + KEYBOARD_KEY_d7=unknown + KEYBOARD_KEY_d8=unknown + # Spectre x360 13 (Prevents random airplane mode activation) evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[sS][pP][eE][cC][tT][rR][eE]*x360*13*:* evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pn*[sS][pP][eE][cC][tT][rR][eE]*x360Convertible*:* @@ -1050,6 +1059,9 @@ evdev:name:SIPODEV Lenovo HID Device:dmi:*:svnLENOVO:*:pvrLenovoideapadD330-10IGM:* KEYBOARD_KEY_70073=f21 # Fn+Supr (Touchpad toggle) +evdev:name:SIPODEV Lenovo HID Device Consumer Control:dmi:*:svnLENOVO:*:pvrLenovoideapadD330-10IGM:* + KEYBOARD_KEY_c00ff=fn_esc # Fn+Tab (FnLk toggle) + ########################################################### # LG ########################################################### diff -Nru systemd-252.17/hwdb.d/60-sensor.hwdb systemd-252.18/hwdb.d/60-sensor.hwdb --- systemd-252.17/hwdb.d/60-sensor.hwdb 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/hwdb.d/60-sensor.hwdb 2023-09-28 17:49:38.000000000 +0000 @@ -210,6 +210,14 @@ ACCEL_LOCATION=display ######################################### +# BUSH +######################################### + +# Bush Windows tablet +sensor:modalias:acpi:KIOX000A*:dmi:*:svnBUSH*:pnBushWindowstablet:* + ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 1, 0, 0 + +######################################### # Chuwi ######################################### @@ -395,6 +403,7 @@ # T11 / Juno Tablet 2 sensor:modalias:acpi:NSA2513*:dmi:*:svnDigitek:* +sensor:modalias:acpi:NSA2513*:dmi:*:svnDefaultstring:* ACCEL_MOUNT_MATRIX=0, -1, 0; 1, 0, 0; 0, 0, 1 ######################################### @@ -926,6 +935,12 @@ ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1 ######################################### +# RCA +######################################### +sensor:modalias:acpi:KIOX000A*:dmi:*:svnRCA:pnW101SA23T1:* + ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1 + +######################################### # Schneider ######################################### @@ -953,6 +968,10 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnTbooK11:* ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1 +# Teclast X3 Plus (G4K3) +sensor:modalias:acpi:KIOX000A*:dmi:*svnTECLAST:pnX3Plus:*:skuG4K3_A1:* + ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1 + # Teclast X4 2-in-1 (G4M6) sensor:modalias:acpi:KIOX000A*:dmi:*:svnTECLAST:pnX4:* ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1 diff -Nru systemd-252.17/hwdb.d/70-mouse.hwdb systemd-252.18/hwdb.d/70-mouse.hwdb --- systemd-252.17/hwdb.d/70-mouse.hwdb 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/hwdb.d/70-mouse.hwdb 2023-09-28 17:49:38.000000000 +0000 @@ -397,9 +397,13 @@ mouse:usb:v046dpc08b:name:Logitech G502 HERO Gaming Mouse:* MOUSE_DPI=1200@1000 *2400@1000 3200@1000 6400@1000 -# Logitech G502 X (Wired) +# Logitech G502 X +mouse:usb:v046dpc099:name:Logitech G502 X:* + MOUSE_DPI=800@1000 1200@1000 *1600@1000 2400@1000 3200@1000 + +# Logitech G502 X LIGHTSPEED (Wired) mouse:usb:v046dpc098:name:Logitech, Inc. G502 X LIGHTSPEED:* -# Logitech G502 X (Wireless) +# Logitech G502 X LIGHTSPEED (Wireless) # The USB receiver is also used by other mice. See #27118. # If you want to enable the entry, please copy below to your custom hwdb file. #mouse:usb:v046dpc547:name:Logitech USB Receiver:* diff -Nru systemd-252.17/hwdb.d/80-ieee1394-unit-function.hwdb systemd-252.18/hwdb.d/80-ieee1394-unit-function.hwdb --- systemd-252.17/hwdb.d/80-ieee1394-unit-function.hwdb 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/hwdb.d/80-ieee1394-unit-function.hwdb 2023-09-28 17:49:38.000000000 +0000 @@ -629,6 +629,16 @@ IEEE1394_UNIT_FUNCTION_AUDIO=1 IEEE1394_UNIT_FUNCTION_VIDEO=0 +# Please take an extra care since the vendor ID (0x0030E0) is for Oxford Semiconductor Ltd. and the +# model ID (0x00f970) is commonly in the other OXFW970 models. +ieee1394:node:ven0x0030e0mo0x00f970units0x00a02d:0x010001 +ieee1394:ven000030E0mo0000F970sp0000A02Dver00010001 + ID_VENDOR_FROM_DATABASE=Miglia Technology + ID_MODEL_FROM_DATABASE=Harmony Audio + IEEE1394_UNIT_FUNCTION_MIDI=0 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 + # # TC Applied Technologies. Digital Interface Communication Engine (DICE). # @@ -903,7 +913,7 @@ ieee1394:node:ven0x001c6amo0x000003units0x001c6a:0x000001 ieee1394:ven00001C6Amo00000003sp00001C6Aver00000001 ID_VENDOR_FROM_DATABASE=Weiss Engineering - ID_MODEL_FROM_DATABASE=Minerva + ID_MODEL_FROM_DATABASE=DAC2/Minerva IEEE1394_UNIT_FUNCTION_AUDIO=1 ieee1394:node:ven0x001c6amo0x000004units0x001c6a:0x000001 @@ -912,16 +922,14 @@ ID_MODEL_FROM_DATABASE=AFI1 IEEE1394_UNIT_FUNCTION_AUDIO=1 -ieee1394:node:ven0x001c6amo0x000005units0x001c6a:0x000001 -ieee1394:ven00001C6Amo00000005sp00001C6Aver00000001 - ID_VENDOR_FROM_DATABASE=Weiss Engineering - ID_MODEL_FROM_DATABASE=DAC1 - IEEE1394_UNIT_FUNCTION_AUDIO=1 - +# Starting from the middle of life time of INT203, the same firmware as +# INT202 is compatible. The firmware dynamically switches its functionality +# based on the state of internal jumper pins. Additionally, the design of +# FireWire option card for DAC1 is something like embedded-INT203. ieee1394:node:ven0x001c6amo0x000006units0x001c6a:0x000001 ieee1394:ven00001C6Amo00000006sp00001C6Aver00000001 ID_VENDOR_FROM_DATABASE=Weiss Engineering - ID_MODEL_FROM_DATABASE=INT202 + ID_MODEL_FROM_DATABASE=INT202/INT203/DAC1 IEEE1394_UNIT_FUNCTION_AUDIO=1 ieee1394:node:ven0x001c6amo0x000007units0x001c6a:0x000001 @@ -930,6 +938,20 @@ ID_MODEL_FROM_DATABASE=DAC202 IEEE1394_UNIT_FUNCTION_AUDIO=1 +ieee1394:node:ven0x001c6amo0x000008units0x001c6a:0x000001 +ieee1394:ven00001C6Amo00000008sp00001C6Aver00000001 + ID_VENDOR_FROM_DATABASE=Weiss Engineering + ID_MODEL_FROM_DATABASE=DAC202/Maya + IEEE1394_UNIT_FUNCTION_AUDIO=1 + +# The older version of firmware for INT203. Additionally, the design of +# FireWire option card for DAC1 is something like embedded-INT203. +ieee1394:node:ven0x001c6amo0x00000aunits0x001c6a:0x000001 +ieee1394:ven00001C6Amo0000000Asp00001C6Aver00000001 + ID_VENDOR_FROM_DATABASE=Weiss Engineering + ID_MODEL_FROM_DATABASE=INT203/DAC1 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + # # Digidesign Digi00x family. # @@ -1387,3 +1409,19 @@ ID_VENDOR_FROM_DATABASE=MOTU ID_MODEL_FROM_DATABASE=MOTU V4HD IEEE1394_UNIT_FUNCTION_VIDEO=1 + +# Weiss Engineering MAN301 (DICE application): unit 0: AV/C devices 1.0. +ieee1394:node:ven0x001c6amo0x00000bunits*0x00a02d:0x010001* +ieee1394:ven00001C6Amo0000000Bsp0000A02Dver00010001 + ID_VENDOR_FROM_DATABASE=Weiss Engineering Ltd. + ID_MODEL_FROM_DATABASE=MAN301 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 + +# Weiss Engineering MAN301 (DICE application): unit 1: TCAT general protocol. +ieee1394:node:ven0x001c6amo0x00000bunits*0x001c6a:0x000001* +ieee1394:ven00001C6Amo0000000Bsp00001C6Aver00000001 + ID_VENDOR_FROM_DATABASE=Weiss Engineering Ltd. + ID_MODEL_FROM_DATABASE=MAN301 + IEEE1394_UNIT_FUNCTION_AUDIO=1 + IEEE1394_UNIT_FUNCTION_VIDEO=0 diff -Nru systemd-252.17/man/kernel-command-line.xml systemd-252.18/man/kernel-command-line.xml --- systemd-252.17/man/kernel-command-line.xml 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/man/kernel-command-line.xml 2023-09-28 17:49:38.000000000 +0000 @@ -54,7 +54,6 @@ systemd.unit= rd.systemd.unit= systemd.dump_core - systemd.early_core_pattern= systemd.crash_chvt systemd.crash_shell systemd.crash_reboot diff -Nru systemd-252.17/man/sd_bus_error_add_map.xml systemd-252.18/man/sd_bus_error_add_map.xml --- systemd-252.17/man/sd_bus_error_add_map.xml 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/man/sd_bus_error_add_map.xml 2023-09-28 17:49:38.000000000 +0000 @@ -35,20 +35,15 @@ … } sd_bus_error_map; - + SD_BUS_ERROR_MAP(name, code) - - SD_BUS_ERROR_MAP(name, code) - - - SD_BUS_ERROR_MAP_END - + SD_BUS_ERROR_MAP_END int sd_bus_error_add_map const sd_bus_error_map *map - + diff -Nru systemd-252.17/src/core/main.c systemd-252.18/src/core/main.c --- systemd-252.17/src/core/main.c 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/src/core/main.c 2023-09-28 17:49:38.000000000 +0000 @@ -2086,7 +2086,7 @@ r = read_one_line_file("/etc/machine-id", &id_text); if (r < 0 || streq(id_text, "uninitialized")) { if (r < 0 && r != -ENOENT) - log_warning_errno(r, "Unexpected error while reading /etc/machine-id, ignoring: %m"); + log_warning_errno(r, "Unexpected error while reading /etc/machine-id, assuming first boot: %m"); first_boot = true; log_info("Detected first boot."); diff -Nru systemd-252.17/src/journal/journald-server.c systemd-252.18/src/journal/journald-server.c --- systemd-252.17/src/journal/journald-server.c 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/src/journal/journald-server.c 2023-09-28 17:49:38.000000000 +0000 @@ -372,8 +372,17 @@ fn = strjoina(s->runtime_storage.path, "/system.journal"); - if (s->system_journal && !relinquish_requested) { + if (!s->system_journal || relinquish_requested) { + /* OK, we really need the runtime journal, so create it if necessary. */ + (void) mkdir_parents(s->runtime_storage.path, 0755); + (void) mkdir(s->runtime_storage.path, 0750); + + r = open_journal(s, true, fn, O_RDWR|O_CREAT, false, &s->runtime_storage.metrics, &s->runtime_journal); + if (r < 0) + return log_error_errno(r, "Failed to open runtime journal: %m"); + + } else if (!flushed_flag_is_set(s)) { /* Try to open the runtime journal, but only * if it already exists, so that we can flush * it into the system journal */ @@ -385,17 +394,6 @@ r = 0; } - - } else { - - /* OK, we really need the runtime journal, so create it if necessary. */ - - (void) mkdir_parents(s->runtime_storage.path, 0755); - (void) mkdir(s->runtime_storage.path, 0750); - - r = open_journal(s, true, fn, O_RDWR|O_CREAT, false, &s->runtime_storage.metrics, &s->runtime_journal); - if (r < 0) - return log_error_errno(r, "Failed to open runtime journal: %m"); } if (s->runtime_journal) { diff -Nru systemd-252.17/src/network/networkd-sriov.c systemd-252.18/src/network/networkd-sriov.c --- systemd-252.17/src/network/networkd-sriov.c 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/src/network/networkd-sriov.c 2023-09-28 17:49:38.000000000 +0000 @@ -209,7 +209,11 @@ if (!link->dev) return -ENODEV; + /* This may return -EINVAL or -ENODEV, instead of -ENOENT, if the device has been removed or is being + * removed. Let's map -EINVAL to -ENODEV, as the caller will ignore -ENODEV. */ r = sd_device_get_sysattr_value(link->dev, "dev_port", &dev_port); + if (r == -EINVAL) + return -ENODEV; if (r < 0) return r; @@ -242,6 +246,8 @@ return -ENODEV; r = sd_device_get_sysattr_value(link->dev, "dev_port", &dev_port); + if (r == -EINVAL) + return -ENODEV; if (r < 0) return r; diff -Nru systemd-252.17/src/shared/hwdb-util.c systemd-252.18/src/shared/hwdb-util.c --- systemd-252.17/src/shared/hwdb-util.c 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/src/shared/hwdb-util.c 2023-09-28 17:49:38.000000000 +0000 @@ -193,7 +193,7 @@ for (size_t i = 0;; i++) { size_t p; - uint8_t c; + char c; struct trie_node *child; for (p = 0; (c = trie->strings->buf[node->prefix_off + p]); p++) { diff -Nru systemd-252.17/src/udev/udevd.c systemd-252.18/src/udev/udevd.c --- systemd-252.17/src/udev/udevd.c 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/src/udev/udevd.c 2023-09-28 17:49:38.000000000 +0000 @@ -55,6 +55,7 @@ #include "pretty-print.h" #include "proc-cmdline.h" #include "process-util.h" +#include "rlimit-util.h" #include "selinux-util.h" #include "signal-util.h" #include "socket-util.h" @@ -2040,6 +2041,9 @@ if (r < 0) return r; + /* Make sure we can have plenty fds (for example for pidfds) */ + (void) rlimit_nofile_bump(-1); + r = RET_NERRNO(mkdir("/run/udev", 0755)); if (r < 0 && r != -EEXIST) return log_error_errno(r, "Failed to create /run/udev: %m"); diff -Nru systemd-252.17/test/test-functions systemd-252.18/test/test-functions --- systemd-252.17/test/test-functions 2023-09-20 09:14:24.000000000 +0000 +++ systemd-252.18/test/test-functions 2023-09-28 17:49:38.000000000 +0000 @@ -369,7 +369,12 @@ swtpm socket --tpm2 --tpmstate dir="$state_dir" --ctrl type=unixio,path="$state_dir/sock" & pid=$! if ! kill -0 "$pid"; then - echo >&2 "Failed to setup swtpm socket" + derror "Failed to start swtpm" + return 1 + fi + + if ! timeout 5 bash -c "until [[ -S $state_dir/sock ]]; do sleep .5; done"; then + derror "Failed to setup swtpm socket" return 1 fi @@ -532,7 +537,6 @@ kernel_params+=( "oops=panic" "panic=1" - "softlockup_panic=1" "systemd.wants=end.service" ) fi