Merge b927c5b352 into c946b13575

Fixes #35277

.github/workflows/linter.yml

@@ -37,7 +37,7 @@ jobs:
           VALIDATE_GITHUB_ACTIONS: true
 
       - name: Check that tabs are not used in Python code
-        run: sh -c '! git grep -P "\\t" -- src/ukify/ukify.py test/integration-test-wrapper.py'
+        run: sh -c '! git grep -P "\\t" -- src/ukify/ukify.py'
 
       - name: Install ruff and mypy
         run: |
@@ -47,14 +47,14 @@ jobs:
       - name: Run mypy
         run: |
           python3 -m mypy --version
-          python3 -m mypy src/ukify/ukify.py test/integration-test-wrapper.py
+          python3 -m mypy src/ukify/ukify.py
 
       - name: Run ruff check
         run: |
           ruff --version
-          ruff check src/ukify/ukify.py test/integration-test-wrapper.py
+          ruff check src/ukify/ukify.py
 
       - name: Run ruff format
         run: |
           ruff --version
-          ruff format --check src/ukify/ukify.py test/integration-test-wrapper.py
+          ruff format --check src/ukify/ukify.py

man/coredumpctl.xml

@@ -391,7 +391,7 @@
     <title>Exit status</title>
     <para>On success, 0 is returned; otherwise, a non-zero failure
     code is returned. Not finding any matching core dumps is treated as
-    failure unless JSON output is enabled.
+    failure.
     </para>
   </refsect1>
 

po/fr.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-06 14:42+0000\n"
-"PO-Revision-Date: 2024-11-23 10:38+0000\n"
+"PO-Revision-Date: 2024-11-20 19:13+0000\n"
 "Last-Translator: Léane GRASSER <leane.grasser@proton.me>\n"
 "Language-Team: French <https://translate.fedoraproject.org/projects/systemd/"
 "main/fr/>\n"
@@ -1258,7 +1258,7 @@ msgstr ""
 
 #: src/sysupdate/org.freedesktop.sysupdate1.policy:75
 msgid "Manage optional features"
-msgstr "Gérer les fonctionnalités facultatives"
+msgstr "Gérer les fonctionnalités en option"
 
 #: src/sysupdate/org.freedesktop.sysupdate1.policy:76
 msgid "Authentication is required to manage optional features"

src/basic/linux/auto_fs.h

@@ -21,7 +21,7 @@
 #define AUTOFS_MIN_PROTO_VERSION	3
 #define AUTOFS_MAX_PROTO_VERSION	5
 
-#define AUTOFS_PROTO_SUBVERSION		6
+#define AUTOFS_PROTO_SUBVERSION		5
 
 /*
  * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed

src/basic/linux/bpf.h

@@ -1121,9 +1121,6 @@ enum bpf_attach_type {
 
 #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
 
-/* Add BPF_LINK_TYPE(type, name) in bpf_types.h to keep bpf_link_type_strs[]
- * in sync with the definitions below.
- */
 enum bpf_link_type {
 	BPF_LINK_TYPE_UNSPEC = 0,
 	BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
@@ -2854,7 +2851,7 @@ union bpf_attr {
  * 		  **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**,
  * 		  **TCP_NODELAY**, **TCP_MAXSEG**, **TCP_WINDOW_CLAMP**,
  * 		  **TCP_THIN_LINEAR_TIMEOUTS**, **TCP_BPF_DELACK_MAX**,
- *		  **TCP_BPF_RTO_MIN**, **TCP_BPF_SOCK_OPS_CB_FLAGS**.
+ * 		  **TCP_BPF_RTO_MIN**.
  * 		* **IPPROTO_IP**, which supports *optname* **IP_TOS**.
  * 		* **IPPROTO_IPV6**, which supports the following *optname*\ s:
  * 		  **IPV6_TCLASS**, **IPV6_AUTOFLOWLABEL**.
@@ -5522,12 +5519,11 @@ union bpf_attr {
  *		**-EOPNOTSUPP** if the hash calculation failed or **-EINVAL** if
  *		invalid arguments are passed.
  *
- * void *bpf_kptr_xchg(void *dst, void *ptr)
+ * void *bpf_kptr_xchg(void *map_value, void *ptr)
  *	Description
- *		Exchange kptr at pointer *dst* with *ptr*, and return the old value.
+ *		Exchange kptr at pointer *map_value* with *ptr*, and return the
- *		*dst* can be map value or local kptr. *ptr* can be NULL, otherwise
+ *		old value. *ptr* can be NULL, otherwise it must be a referenced
- *		it must be a referenced pointer which will be released when this helper
+ *		pointer which will be released when this helper is called.
- *		is called.
  *	Return
  *		The old value of kptr (which can be NULL). The returned pointer
  *		if not NULL, is a reference which must be released using its
@@ -6050,6 +6046,11 @@ enum {
 	BPF_F_MARK_ENFORCE		= (1ULL << 6),
 };
 
+/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
+enum {
+	BPF_F_INGRESS			= (1ULL << 0),
+};
+
 /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
 enum {
 	BPF_F_TUNINFO_IPV6		= (1ULL << 0),
@@ -6196,12 +6197,10 @@ enum {
 	BPF_F_BPRM_SECUREEXEC	= (1ULL << 0),
 };
 
-/* Flags for bpf_redirect and bpf_redirect_map helpers */
+/* Flags for bpf_redirect_map helper */
 enum {
-	BPF_F_INGRESS		= (1ULL << 0), /* used for skb path */
+	BPF_F_BROADCAST		= (1ULL << 3),
-	BPF_F_BROADCAST		= (1ULL << 3), /* used for XDP path */
+	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4),
-	BPF_F_EXCLUDE_INGRESS	= (1ULL << 4), /* used for XDP path */
-#define BPF_F_REDIRECT_FLAGS (BPF_F_INGRESS | BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS)
 };
 
 #define __bpf_md_ptr(type, name)	\
@@ -7081,7 +7080,6 @@ enum {
 	TCP_BPF_SYN		= 1005, /* Copy the TCP header */
 	TCP_BPF_SYN_IP		= 1006, /* Copy the IP[46] and TCP header */
 	TCP_BPF_SYN_MAC         = 1007, /* Copy the MAC, IP[46], and TCP header */
-	TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */
 };
 
 enum {
@@ -7514,13 +7512,4 @@ struct bpf_iter_num {
 	__u64 __opaque[1];
 } __attribute__((aligned(8)));
 
-/*
- * Flags to control BPF kfunc behaviour.
- *     - BPF_F_PAD_ZEROS: Pad destination buffer with zeros. (See the respective
- *       helper documentation for details.)
- */
-enum bpf_kfunc_flags {
-	BPF_F_PAD_ZEROS = (1ULL << 0),
-};
-
 #endif /* __LINUX_BPF_H__ */

src/basic/linux/const.h

@@ -28,23 +28,6 @@
 #define _BITUL(x)	(_UL(1) << (x))
 #define _BITULL(x)	(_ULL(1) << (x))
 
-#if !defined(__ASSEMBLY__)
-/*
- * Missing __asm__ support
- *
- * __BIT128() would not work in the __asm__ code, as it shifts an
- * 'unsigned __init128' data type as direct representation of
- * 128 bit constants is not supported in the gcc compiler, as
- * they get silently truncated.
- *
- * TODO: Please revisit this implementation when gcc compiler
- * starts representing 128 bit constants directly like long
- * and unsigned long etc. Subsequently drop the comment for
- * GENMASK_U128() which would then start supporting __asm__ code.
- */
-#define _BIT128(x)	((unsigned __int128)(1) << (x))
-#endif
-
 #define __ALIGN_KERNEL(x, a)		__ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)
 #define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))
 

src/basic/linux/ethtool.h

@@ -2531,20 +2531,4 @@ struct ethtool_link_settings {
 	 * __u32 map_lp_advertising[link_mode_masks_nwords];
 	 */
 };
-
-/**
- * enum phy_upstream - Represents the upstream component a given PHY device
- * is connected to, as in what is on the other end of the MII bus. Most PHYs
- * will be attached to an Ethernet MAC controller, but in some cases, there's
- * an intermediate PHY used as a media-converter, which will driver another
- * MII interface as its output.
- * @PHY_UPSTREAM_MAC: Upstream component is a MAC (a switch port,
- *		      or ethernet controller)
- * @PHY_UPSTREAM_PHY: Upstream component is a PHY (likely a media converter)
- */
-enum phy_upstream {
-	PHY_UPSTREAM_MAC,
-	PHY_UPSTREAM_PHY,
-};
-
 #endif /* _LINUX_ETHTOOL_H */

src/basic/linux/fib_rules.h

@@ -67,7 +67,6 @@ enum {
 	FRA_IP_PROTO,	/* ip proto */
 	FRA_SPORT_RANGE, /* sport */
 	FRA_DPORT_RANGE, /* dport */
-	FRA_DSCP,	/* dscp */
 	__FRA_MAX
 };
 

src/basic/linux/if_packet.h

@@ -230,8 +230,8 @@ struct tpacket_hdr_v1 {
 	 * ts_first_pkt:
 	 *		Is always the time-stamp when the block was opened.
 	 *		Case a)	ZERO packets
-	 *			No packets to deal with but at least you know
+	 *			No packets to deal with but atleast you know the
-	 *			the time-interval of this block.
+	 *			time-interval of this block.
 	 *		Case b) Non-zero packets
 	 *			Use the ts of the first packet in the block.
 	 *
@@ -265,8 +265,7 @@ enum tpacket_versions {
    - struct tpacket_hdr
    - pad to TPACKET_ALIGNMENT=16
    - struct sockaddr_ll
-   - Gap, chosen so that packet data (Start+tp_net) aligns to
+   - Gap, chosen so that packet data (Start+tp_net) alignes to TPACKET_ALIGNMENT=16
-     TPACKET_ALIGNMENT=16
    - Start+tp_mac: [ Optional MAC header ]
    - Start+tp_net: Packet data, aligned to TPACKET_ALIGNMENT=16.
    - Pad to align to TPACKET_ALIGNMENT=16

src/basic/linux/in.h

@@ -141,7 +141,7 @@ struct in_addr {
  */
 #define IP_PMTUDISC_INTERFACE		4
 /* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get
- * fragmented if they exceed the interface mtu
+ * fragmented if they exeed the interface mtu
  */
 #define IP_PMTUDISC_OMIT		5
 

src/basic/linux/libc-compat.h

@@ -140,6 +140,25 @@
 
 #endif /* _NETINET_IN_H */
 
+/* Coordinate with glibc netipx/ipx.h header. */
+#if defined(__NETIPX_IPX_H)
+
+#define __UAPI_DEF_SOCKADDR_IPX			0
+#define __UAPI_DEF_IPX_ROUTE_DEFINITION		0
+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION	0
+#define __UAPI_DEF_IPX_CONFIG_DATA		0
+#define __UAPI_DEF_IPX_ROUTE_DEF		0
+
+#else /* defined(__NETIPX_IPX_H) */
+
+#define __UAPI_DEF_SOCKADDR_IPX			1
+#define __UAPI_DEF_IPX_ROUTE_DEFINITION		1
+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION	1
+#define __UAPI_DEF_IPX_CONFIG_DATA		1
+#define __UAPI_DEF_IPX_ROUTE_DEF		1
+
+#endif /* defined(__NETIPX_IPX_H) */
+
 /* Definitions for xattr.h */
 #if defined(_SYS_XATTR_H)
 #define __UAPI_DEF_XATTR		0
@@ -221,6 +240,23 @@
 #define __UAPI_DEF_IP6_MTUINFO		1
 #endif
 
+/* Definitions for ipx.h */
+#ifndef __UAPI_DEF_SOCKADDR_IPX
+#define __UAPI_DEF_SOCKADDR_IPX			1
+#endif
+#ifndef __UAPI_DEF_IPX_ROUTE_DEFINITION
+#define __UAPI_DEF_IPX_ROUTE_DEFINITION		1
+#endif
+#ifndef __UAPI_DEF_IPX_INTERFACE_DEFINITION
+#define __UAPI_DEF_IPX_INTERFACE_DEFINITION	1
+#endif
+#ifndef __UAPI_DEF_IPX_CONFIG_DATA
+#define __UAPI_DEF_IPX_CONFIG_DATA		1
+#endif
+#ifndef __UAPI_DEF_IPX_ROUTE_DEF
+#define __UAPI_DEF_IPX_ROUTE_DEF		1
+#endif
+
 /* Definitions for xattr.h */
 #ifndef __UAPI_DEF_XATTR
 #define __UAPI_DEF_XATTR		1

src/basic/linux/netfilter/nf_tables.h

@@ -436,7 +436,7 @@ enum nft_set_elem_flags {
  * @NFTA_SET_ELEM_KEY: key value (NLA_NESTED: nft_data)
  * @NFTA_SET_ELEM_DATA: data value of mapping (NLA_NESTED: nft_data_attributes)
  * @NFTA_SET_ELEM_FLAGS: bitmask of nft_set_elem_flags (NLA_U32)
- * @NFTA_SET_ELEM_TIMEOUT: timeout value, zero means never times out (NLA_U64)
+ * @NFTA_SET_ELEM_TIMEOUT: timeout value (NLA_U64)
  * @NFTA_SET_ELEM_EXPIRATION: expiration time (NLA_U64)
  * @NFTA_SET_ELEM_USERDATA: user data (NLA_BINARY)
  * @NFTA_SET_ELEM_EXPR: expression (NLA_NESTED: nft_expr_attributes)
@@ -1694,7 +1694,7 @@ enum nft_flowtable_flags {
  *
  * @NFTA_FLOWTABLE_TABLE: name of the table containing the expression (NLA_STRING)
  * @NFTA_FLOWTABLE_NAME: name of this flow table (NLA_STRING)
- * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration (NLA_NESTED)
+ * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
  * @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
  * @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
  * @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)

src/basic/linux/nexthop.h

@@ -16,15 +16,10 @@ struct nhmsg {
 struct nexthop_grp {
 	__u32	id;	  /* nexthop id - must exist */
 	__u8	weight;   /* weight of this nexthop */
-	__u8	weight_high;	/* high order bits of weight */
+	__u8	resvd1;
 	__u16	resvd2;
 };
 
-static __inline__ __u16 nexthop_grp_weight(const struct nexthop_grp *entry)
-{
-	return ((entry->weight_high << 8) | entry->weight) + 1;
-}
-
 enum {
 	NEXTHOP_GRP_TYPE_MPATH,  /* hash-threshold nexthop group
 				  * default type if not specified
@@ -38,9 +33,6 @@ enum {
 #define NHA_OP_FLAG_DUMP_STATS		BIT(0)
 #define NHA_OP_FLAG_DUMP_HW_STATS	BIT(1)
 
-/* Response OP_FLAGS. */
-#define NHA_OP_FLAG_RESP_GRP_RESVD_0	BIT(31)	/* Dump clears resvd fields. */
-
 enum {
 	NHA_UNSPEC,
 	NHA_ID,		/* u32; id for nexthop. id == 0 means auto-assign */

src/basic/namespace-util.c

@@ -531,24 +531,20 @@ int is_idmapping_supported(const char *path) {
         userns_fd = userns_acquire(uid_map, gid_map);
         if (ERRNO_IS_NEG_NOT_SUPPORTED(userns_fd) || ERRNO_IS_NEG_PRIVILEGE(userns_fd))
                 return false;
-        if (userns_fd == -ENOSPC) {
-                log_debug_errno(userns_fd, "Failed to acquire new user namespace, user.max_user_namespaces seems to be exhausted or maybe even zero, assuming ID-mapping is not supported: %m");
-                return false;
-        }
         if (userns_fd < 0)
-                return log_debug_errno(userns_fd, "Failed to acquire new user namespace for checking if '%s' supports ID-mapping: %m", path);
+                return log_debug_errno(userns_fd, "ID-mapping supported namespace acquire failed for '%s' : %m", path);
 
         dir_fd = RET_NERRNO(open(path, O_RDONLY | O_CLOEXEC | O_NOFOLLOW));
         if (ERRNO_IS_NEG_NOT_SUPPORTED(dir_fd))
                 return false;
         if (dir_fd < 0)
-                return log_debug_errno(dir_fd, "Failed to open '%s', cannot determine if ID-mapping is supported: %m", path);
+                return log_debug_errno(dir_fd, "ID-mapping supported open failed for '%s' : %m", path);
 
         mount_fd = RET_NERRNO(open_tree(dir_fd, "", AT_EMPTY_PATH | OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC));
         if (ERRNO_IS_NEG_NOT_SUPPORTED(mount_fd) || ERRNO_IS_NEG_PRIVILEGE(mount_fd) || mount_fd == -EINVAL)
                 return false;
         if (mount_fd < 0)
-                return log_debug_errno(mount_fd, "Failed to open mount tree '%s', cannot determine if ID-mapping is supported: %m", path);
+                return log_debug_errno(mount_fd, "ID-mapping supported open_tree failed for '%s' : %m", path);
 
         r = RET_NERRNO(mount_setattr(mount_fd, "", AT_EMPTY_PATH,
                        &(struct mount_attr) {
@@ -558,7 +554,7 @@ int is_idmapping_supported(const char *path) {
         if (ERRNO_IS_NEG_NOT_SUPPORTED(r) || ERRNO_IS_NEG_PRIVILEGE(r) || r == -EINVAL)
                 return false;
         if (r < 0)
-                return log_debug_errno(r, "Failed to set mount attribute to '%s', cannot determine if ID-mapping is supported: %m", path);
+                return log_debug_errno(r, "ID-mapping supported setattr failed for '%s' : %m", path);
 
         return true;
 }

src/coredump/coredumpctl.c

@@ -965,8 +965,6 @@ static int dump_list(int argc, char **argv, void *userdata) {
                 if (!arg_field && n_found <= 0) {
                         if (!arg_quiet)
                                 log_notice("No coredumps found.");
-
-                        if (!sd_json_format_enabled(arg_json_format_flags))
                         return -ESRCH;
                 }
         }

src/fsck/fsck.c

@@ -98,11 +98,16 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                 }
         }
 
-        else if (streq(key, "fastboot") && !value)
+#if HAVE_SYSV_COMPAT
+        else if (streq(key, "fastboot") && !value) {
+                log_warning("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
                 arg_skip = true;
 
-        else if (streq(key, "forcefsck") && !value)
+        } else if (streq(key, "forcefsck") && !value) {
+                log_warning("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
                 arg_force = true;
+        }
+#endif
 
         return 0;
 }

src/measure/measure.c

@@ -108,7 +108,6 @@ static int help(int argc, char *argv[], void *userdata) {
                "     --ucode=PATH        Path to microcode image file           %7$s .ucode\n"
                "     --splash=PATH       Path to splash bitmap file             %7$s .splash\n"
                "     --dtb=PATH          Path to DeviceTree file                %7$s .dtb\n"
-               "     --dtbauto=PATH      Path to DeviceTree file for auto selection %7$s .dtbauto\n"
                "     --uname=PATH        Path to 'uname -r' file                %7$s .uname\n"
                "     --sbat=PATH         Path to SBAT file                      %7$s .sbat\n"
                "     --pcrpkey=PATH      Path to public key for PCR signatures  %7$s .pcrpkey\n"

src/nspawn/nspawn.c

@@ -2280,9 +2280,10 @@ static int copy_devnode_one(const char *dest, const char *node, bool ignore_mkno
         r = path_extract_directory(from, &parent);
         if (r < 0)
                 return log_error_errno(r, "Failed to extract directory from %s: %m", from);
-        r = userns_mkdir(dest, parent, 0755, 0, 0);
+        if (!path_equal(parent, "/dev/")) {
-        if (r < 0)
+                if (userns_mkdir(dest, parent, 0755, 0, 0) < 0)
                         return log_error_errno(r, "Failed to create directory %s: %m", parent);
+        }
 
         if (mknod(to, st.st_mode, st.st_rdev) < 0) {
                 r = -errno; /* Save the original error code. */
@@ -4653,7 +4654,7 @@ static int nspawn_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t r
 
         ucred = CMSG_FIND_DATA(&msghdr, SOL_SOCKET, SCM_CREDENTIALS, struct ucred);
         if (!ucred || ucred->pid != inner_child_pid) {
-                log_debug("Received notify message from process that is not the payload's PID 1. Ignoring.");
+                log_debug("Received notify message without valid credentials. Ignoring.");
                 return 0;
         }
 

src/quotacheck/quotacheck.c

@@ -36,9 +36,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                         arg_skip = true;
                 else
                         log_warning("Invalid quotacheck.mode= value, ignoring: %s", value);
+        }
 
-        } else if (streq(key, "forcequotacheck") && !value)
+#if HAVE_SYSV_COMPAT
+        else if (streq(key, "forcequotacheck") && !value) {
+                log_warning("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line. Proceeding anyway.");
                 arg_force = true;
+        }
+#endif
 
         return 0;
 }

src/shutdown/detach-dm.c

@@ -98,17 +98,15 @@ static int delete_dm(DeviceMapper *m) {
         assert(major(m->devnum) != 0);
         assert(m->path);
 
-        fd = open(m->path, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
-        if (fd < 0)
-                log_debug_errno(errno, "Failed to open DM block device %s for syncing, ignoring: %m", m->path);
-        else {
-                (void) sync_with_progress(fd);
-                fd = safe_close(fd);
-        }
-
         fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC);
         if (fd < 0)
-                return log_debug_errno(errno, "Failed to open /dev/mapper/control: %m");
+                return -errno;
+
+        _cleanup_close_ int block_fd = open(m->path, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
+        if (block_fd < 0)
+                log_debug_errno(errno, "Failed to open DM block device %s for syncing, ignoring: %m", m->path);
+        else
+                (void) sync_with_progress(block_fd);
 
         return RET_NERRNO(ioctl(fd, DM_DEV_REMOVE, &(struct dm_ioctl) {
                 .version = {

src/shutdown/shutdown.c

@@ -211,8 +211,10 @@ static int sync_making_progress(unsigned long long *prev_dirty) {
                         continue;
 
                 errno = 0;
-                if (sscanf(line, "%*s %llu %*s", &ull) != 1)
+                if (sscanf(line, "%*s %llu %*s", &ull) != 1) {
-                        return log_warning_errno(errno_or_else(EIO), "Failed to parse /proc/meminfo field: %m");
+                        log_warning_errno(errno_or_else(EIO), "Failed to parse /proc/meminfo field, ignoring: %m");
+                        return false;
+                }
 
                 val += ull;
         }

test/integration-test-wrapper.py

@@ -1,18 +1,20 @@
 #!/usr/bin/python3
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-"""Test wrapper command for driving integration tests."""
+'''Test wrapper command for driving integration tests.
+'''
 
 import argparse
 import json
 import os
-import re
 import shlex
 import subprocess
 import sys
 import textwrap
+import re
 from pathlib import Path
 
+
 EMERGENCY_EXIT_DROPIN = """\
 [Unit]
 Wants=emergency-exit.service
@@ -40,20 +42,16 @@ def dump_coredumps(args: argparse.Namespace, journal_file: Path) -> bool:
     #   systemd-notify - intermittent (and intentional) SIGABRT caused by TEST-59
     #   test-execute - intentional coredump in TEST-02
     #   test(-usr)?-dump - intentional coredumps from systemd-coredump tests in TEST-74
-    exclude_regex = re.compile('/(bash|sleep|systemd-notify|test-execute|test(-usr)?-dump)')
+    exclude_regex = re.compile("/(bash|sleep|systemd-notify|test-execute|test(-usr)?-dump)")
 
     coredumps = json.loads(
         subprocess.run(
             [
                 args.mkosi,
-                '--directory',
+                "--directory", os.fspath(args.meson_source_dir),
-                os.fspath(args.meson_source_dir),
+                "--forward-journal", journal_file,
-                '--extra-search-path',
+                "coredumpctl",
-                os.fspath(args.meson_build_dir),
+                "--json=short",
-                '--forward-journal',
-                journal_file,
-                'coredumpctl',
-                '--json=short',
             ],
             check=True,
             stdout=subprocess.PIPE,
@@ -61,7 +59,7 @@ def dump_coredumps(args: argparse.Namespace, journal_file: Path) -> bool:
         ).stdout
     )
 
-    coredumps = [coredump for coredump in coredumps if not exclude_regex.search(coredump['exe'])]
+    coredumps = [coredump for coredump in coredumps if not exclude_regex.search(coredump["exe"])]
 
     if not coredumps:
         return False
@@ -72,13 +70,11 @@ def dump_coredumps(args: argparse.Namespace, journal_file: Path) -> bool:
         subprocess.run(
             [
                 args.mkosi,
-                '--directory',
+                "--directory", os.fspath(args.meson_source_dir),
-                os.fspath(args.meson_source_dir),
+                "--forward-journal", journal_file,
-                '--forward-journal',
+                "coredumpctl",
-                journal_file,
+                "info",
-                'coredumpctl',
+                coredump["exe"],
-                'info',
-                coredump['exe'],
             ],
             check=True,
         )
@@ -88,7 +84,7 @@ def dump_coredumps(args: argparse.Namespace, journal_file: Path) -> bool:
     return True
 
 
-def main() -> None:
+def main():
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('--mkosi', required=True)
     parser.add_argument('--meson-source-dir', required=True, type=Path)
@@ -100,43 +96,34 @@ def main() -> None:
     parser.add_argument('--slow', action=argparse.BooleanOptionalAction)
     parser.add_argument('--vm', action=argparse.BooleanOptionalAction)
     parser.add_argument('--exit-code', required=True, type=int)
-    parser.add_argument('mkosi_args', nargs='*')
+    parser.add_argument('mkosi_args', nargs="*")
     args = parser.parse_args()
 
-    if not bool(int(os.getenv('SYSTEMD_INTEGRATION_TESTS', '0'))):
+    if not bool(int(os.getenv("SYSTEMD_INTEGRATION_TESTS", "0"))):
-        print(
+        print(f"SYSTEMD_INTEGRATION_TESTS=1 not found in environment, skipping {args.name}", file=sys.stderr)
-            f'SYSTEMD_INTEGRATION_TESTS=1 not found in environment, skipping {args.name}',
-            file=sys.stderr,
-        )
         exit(77)
 
-    if args.slow and not bool(int(os.getenv('SYSTEMD_SLOW_TESTS', '0'))):
+    if args.slow and not bool(int(os.getenv("SYSTEMD_SLOW_TESTS", "0"))):
-        print(
+        print(f"SYSTEMD_SLOW_TESTS=1 not found in environment, skipping {args.name}", file=sys.stderr)
-            f'SYSTEMD_SLOW_TESTS=1 not found in environment, skipping {args.name}',
-            file=sys.stderr,
-        )
         exit(77)
 
-    if args.vm and bool(int(os.getenv('TEST_NO_QEMU', '0'))):
+    if args.vm and bool(int(os.getenv("TEST_NO_QEMU", "0"))):
-        print(f'TEST_NO_QEMU=1, skipping {args.name}', file=sys.stderr)
+        print(f"TEST_NO_QEMU=1, skipping {args.name}", file=sys.stderr)
         exit(77)
 
-    for s in os.getenv('TEST_SKIP', '').split():
+    for s in os.getenv("TEST_SKIP", "").split():
         if s in args.name:
-            print(f'Skipping {args.name} due to TEST_SKIP', file=sys.stderr)
+            print(f"Skipping {args.name} due to TEST_SKIP", file=sys.stderr)
             exit(77)
 
-    keep_journal = os.getenv('TEST_SAVE_JOURNAL', 'fail')
+    keep_journal = os.getenv("TEST_SAVE_JOURNAL", "fail")
-    shell = bool(int(os.getenv('TEST_SHELL', '0')))
+    shell = bool(int(os.getenv("TEST_SHELL", "0")))
 
     if shell and not sys.stderr.isatty():
-        print(
+        print("--interactive must be passed to meson test to use TEST_SHELL=1", file=sys.stderr)
-            '--interactive must be passed to meson test to use TEST_SHELL=1',
-            file=sys.stderr,
-        )
         exit(1)
 
-    name = args.name + (f'-{i}' if (i := os.getenv('MESON_TEST_ITERATION')) else '')
+    name = args.name + (f"-{i}" if (i := os.getenv("MESON_TEST_ITERATION")) else "")
 
     dropin = textwrap.dedent(
         """\
@@ -154,7 +141,7 @@ def main() -> None:
             """
         )
 
-    if os.getenv('TEST_MATCH_SUBTEST'):
+    if os.getenv("TEST_MATCH_SUBTEST"):
         dropin += textwrap.dedent(
             f"""
             [Service]
@@ -162,7 +149,7 @@ def main() -> None:
             """
         )
 
-    if os.getenv('TEST_MATCH_TESTCASE'):
+    if os.getenv("TEST_MATCH_TESTCASE"):
         dropin += textwrap.dedent(
             f"""
             [Service]
@@ -170,7 +157,7 @@ def main() -> None:
             """
         )
 
-    journal_file = (args.meson_build_dir / (f'test/journal/{name}.journal')).absolute()
+    journal_file = (args.meson_build_dir / (f"test/journal/{name}.journal")).absolute()
     journal_file.unlink(missing_ok=True)
 
     if not sys.stderr.isatty():
@@ -190,55 +177,47 @@ def main() -> None:
 
     cmd = [
         args.mkosi,
-        '--directory',
+        '--directory', os.fspath(args.meson_source_dir),
-        os.fspath(args.meson_source_dir),
+        '--output-dir', os.fspath(args.meson_build_dir / 'mkosi.output'),
-        '--output-dir',
+        '--extra-search-path', os.fspath(args.meson_build_dir),
-        os.fspath(args.meson_build_dir / 'mkosi.output'),
+        '--machine', name,
-        '--extra-search-path',
-        os.fspath(args.meson_build_dir),
-        '--machine',
-        name,
         '--ephemeral',
         *(['--forward-journal', journal_file] if journal_file else []),
         *(
             [
                 '--credential',
-                f'systemd.extra-unit.emergency-exit.service={shlex.quote(EMERGENCY_EXIT_SERVICE)}',
+                f"systemd.extra-unit.emergency-exit.service={shlex.quote(EMERGENCY_EXIT_SERVICE)}",
                 '--credential',
-                f'systemd.unit-dropin.emergency.target={shlex.quote(EMERGENCY_EXIT_DROPIN)}',
+                f"systemd.unit-dropin.emergency.target={shlex.quote(EMERGENCY_EXIT_DROPIN)}",
             ]
             if not sys.stderr.isatty()
             else []
         ),
         '--credential',
-        f'systemd.unit-dropin.{args.unit}={shlex.quote(dropin)}',
+        f"systemd.unit-dropin.{args.unit}={shlex.quote(dropin)}",
         '--runtime-network=none',
         '--runtime-scratch=no',
         *args.mkosi_args,
-        '--qemu-firmware',
+        '--qemu-firmware', args.firmware,
-        args.firmware,
+        *(['--qemu-kvm', 'no'] if int(os.getenv("TEST_NO_KVM", "0")) else []),
-        *(['--qemu-kvm', 'no'] if int(os.getenv('TEST_NO_KVM', '0')) else []),
         '--kernel-command-line-extra',
-        ' '.join(
+        ' '.join([
-            [
             'systemd.hostname=H',
-                f'SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/{args.name}.units:/usr/lib/systemd/tests/testdata/units:',
+            f"SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/{args.name}.units:/usr/lib/systemd/tests/testdata/units:",
-                *([f'systemd.unit={args.unit}'] if not shell else []),
+            *([f"systemd.unit={args.unit}"] if not shell else []),
             'systemd.mask=systemd-networkd-wait-online.service',
             *(
                 [
-                        'systemd.mask=serial-getty@.service',
+                    "systemd.mask=serial-getty@.service",
-                        'systemd.show_status=error',
+                    "systemd.show_status=error",
-                        'systemd.crash_shell=0',
+                    "systemd.crash_shell=0",
-                        'systemd.crash_action=poweroff',
+                    "systemd.crash_action=poweroff",
                 ]
                 if not sys.stderr.isatty()
                 else []
             ),
-            ]
+        ]),
-        ),
+        '--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}",
-        '--credential',
-        f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}",
         *(['--runtime-build-sources=no'] if not sys.stderr.isatty() else []),
         'qemu' if args.vm or os.getuid() != 0 else 'boot',
     ]
@@ -247,21 +226,15 @@ def main() -> None:
 
     # On Debian/Ubuntu we get a lot of random QEMU crashes. Retry once, and then skip if it fails again.
     if args.vm and result.returncode == 247 and args.exit_code != 247:
-        if journal_file:
         journal_file.unlink(missing_ok=True)
         result = subprocess.run(cmd)
         if args.vm and result.returncode == 247 and args.exit_code != 247:
-            print(
+            print(f"Test {args.name} failed due to QEMU crash (error 247), ignoring", file=sys.stderr)
-                f'Test {args.name} failed due to QEMU crash (error 247), ignoring',
-                file=sys.stderr,
-            )
             exit(77)
 
     coredumps = dump_coredumps(args, journal_file)
 
-    if keep_journal == '0' or (
+    if keep_journal == "0" or (keep_journal == "fail" and result.returncode in (args.exit_code, 77) and not coredumps):
-        keep_journal == 'fail' and result.returncode in (args.exit_code, 77) and not coredumps
-    ):
         journal_file.unlink(missing_ok=True)
 
     if shell or (result.returncode in (args.exit_code, 77) and not coredumps):
@@ -269,31 +242,31 @@ def main() -> None:
 
     ops = []
 
-    if os.getenv('GITHUB_ACTIONS'):
+    if os.getenv("GITHUB_ACTIONS"):
-        id = os.environ['GITHUB_RUN_ID']
+        id = os.environ["GITHUB_RUN_ID"]
-        iteration = os.environ['GITHUB_RUN_ATTEMPT']
+        iteration = os.environ["GITHUB_RUN_ATTEMPT"]
         j = json.loads(
             subprocess.run(
                 [
                     args.mkosi,
-                    '--directory',
+                    "--directory", os.fspath(args.meson_source_dir),
-                    os.fspath(args.meson_source_dir),
+                    "--json",
-                    '--json',
+                    "summary",
-                    'summary',
                 ],
                 stdout=subprocess.PIPE,
                 text=True,
             ).stdout
         )
-        distribution = j['Images'][-1]['Distribution']
+        distribution = j["Images"][-1]["Distribution"]
-        release = j['Images'][-1]['Release']
+        release = j["Images"][-1]["Release"]
-        artifact = f'ci-mkosi-{id}-{iteration}-{distribution}-{release}-failed-test-journals'
+        artifact = f"ci-mkosi-{id}-{iteration}-{distribution}-{release}-failed-test-journals"
-        ops += [f'gh run download {id} --name {artifact} -D ci/{artifact}']
+        ops += [f"gh run download {id} --name {artifact} -D ci/{artifact}"]
-        journal_file = Path(f'ci/{artifact}/test/journal/{name}.journal')
+        journal_file = Path(f"ci/{artifact}/test/journal/{name}.journal")
 
-    ops += [f'journalctl --file {journal_file} --no-hostname -o short-monotonic -u {args.unit} -p info']
+    ops += [f"journalctl --file {journal_file} --no-hostname -o short-monotonic -u {args.unit} -p info"]
 
-    print("Test failed, relevant logs can be viewed with: \n\n" f"{(' && '.join(ops))}\n", file=sys.stderr)
+    print("Test failed, relevant logs can be viewed with: \n\n"
+            f"{(' && '.join(ops))}\n", file=sys.stderr)
 
     # 0 also means we failed so translate that to a non-zero exit code to mark the test as failed.
     exit(result.returncode or 1)

test/networkd-test.py

@@ -960,13 +960,10 @@ exec $(systemctl cat systemd-networkd.service | sed -n '/^ExecStart=/ {{ s/^.*=/
 
         # wait until devices got created
         for _ in range(50):
-            if subprocess.run(['ip', 'link', 'show', 'dev', self.if_router],
+            out = subprocess.check_output(['ip', 'a', 'show', 'dev', self.if_router])
-                              stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0:
+            if b'state UP' in out and b'scope global' in out:
                 break
             time.sleep(0.1)
-        else:
-            subprocess.call(['ip', 'link', 'show', 'dev', self.if_router])
-            self.fail('Timed out waiting for {ifr} created.'.format(ifr=self.if_router))
 
     def shutdown_iface(self):
         '''Remove test interface and stop DHCP server'''