.github/workflows/build-test.sh

@@ -27,7 +27,6 @@ PACKAGES=(
     isc-dhcp-client
     itstool
     kbd
-    libarchive-dev
     libblkid-dev
     libbpf-dev
     libcap-dev

src/libsystemd/sd-device/test-sd-device.c

@@ -303,12 +303,8 @@ static void exclude_problematic_devices(sd_device_enumerator *e) {
          * disappear during running this test. Let's exclude them here for stability. */
         ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "bdi", false));
         ASSERT_OK(sd_device_enumerator_add_nomatch_sysname(e, "loop*"));
-        /* On some CI environments, it seems dm block devices sometimes disappear during running this test.
-         * Let's exclude them here for stability. */
-        ASSERT_OK(sd_device_enumerator_add_nomatch_sysname(e, "dm-*"));
-        /* Several other unit tests create and remove virtual network interfaces, e.g. test-netlink and
-         * test-local-addresses. When one of these tests run in parallel with this unit test, the enumerated
-         * device may disappear. Let's exclude them here for stability. */
+        /* On CentOS CI, systemd-networkd-tests.py may be running when this test is invoked. The networkd
+         * test creates and removes many network interfaces, and may interfere with this test. */
         ASSERT_OK(sd_device_enumerator_add_match_subsystem(e, "net", false));
 }
 

src/shared/varlink-idl-common.c

@@ -18,7 +18,7 @@ SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_FIELD_COMMENT("64bit inode number of pidfd if known"),
                 SD_VARLINK_DEFINE_FIELD(pidfdId, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("Boot ID of the system the inode number belongs to"),
-                SD_VARLINK_DEFINE_FIELD(bootId, SD_VARLINK_STRING, SD_VARLINK_NULLABLE));
+                SD_VARLINK_DEFINE_FIELD(bootId, SD_VARLINK_INT, SD_VARLINK_NULLABLE));
 
 SD_VARLINK_DEFINE_STRUCT_TYPE(
                 RateLimit,

test/units/TEST-17-UDEV.verify.sh

@@ -293,7 +293,7 @@ test_syntax_error 'OWNER!="b"' 'Invalid operator for OWNER.'
 test_syntax_error 'OWNER+="0"' "OWNER key takes '=' or ':=' operator, assuming '='."
 # numeric system UID is valid even if it does not exist
 SYS_UID_MAX=999
-if command -v userdbctl >/dev/null; then
+if command userdbctl >/dev/null; then
     # For the case if non-default setting is used. E.g. OpenSUSE uses 499.
     SYS_UID_MAX="$(userdbctl user -S --no-legend --no-pager | grep 'end system' | awk '{print $8}')"
     echo "SYS_UID_MAX=$SYS_UID_MAX acquired from userdbctl"
@@ -325,7 +325,7 @@ test_syntax_error 'GROUP!="b"' 'Invalid operator for GROUP.'
 test_syntax_error 'GROUP+="0"' "GROUP key takes '=' or ':=' operator, assuming '='."
 # numeric system GID is valid even if it does not exist
 SYS_GID_MAX=999
-if command -v userdbctl >/dev/null; then
+if command userdbctl >/dev/null; then
     # For the case if non-default setting is used. E.g. OpenSUSE uses 499.
     SYS_GID_MAX="$(userdbctl group -S --no-legend --no-pager | grep 'end system' | awk '{print $8}')"
     echo "SYS_GID_MAX=$SYS_GID_MAX acquired from userdbctl"

test/units/TEST-75-RESOLVED.sh

@@ -16,7 +16,7 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-if ! command -v knotc >/dev/null; then
+if ! command knotc >/dev/null; then
     echo "command knotc not found, skipping..." | tee --append /skipped
     exit 77
 fi