.github/workflows/coverage.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-      - uses: systemd/mkosi@66d51024b7149f40be4702e84275c936373ace97
+      - uses: systemd/mkosi@4b18ea8395e9cc2b1d247be93944f5539affe964
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

.github/workflows/linter.yml

@@ -39,7 +39,7 @@ jobs:
           GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml
           ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT: false
 
-      - uses: systemd/mkosi@66d51024b7149f40be4702e84275c936373ace97
+      - uses: systemd/mkosi@4b18ea8395e9cc2b1d247be93944f5539affe964
 
       - name: Check that tabs are not used in Python code
         run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py'

.github/workflows/mkosi.yml

@@ -167,7 +167,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-      - uses: systemd/mkosi@66d51024b7149f40be4702e84275c936373ace97
+      - uses: systemd/mkosi@4b18ea8395e9cc2b1d247be93944f5539affe964
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

meson.build

@@ -256,6 +256,7 @@ conf.set_quoted('KERNEL_INSTALL_DIR',                         kernelinstalldir)
 conf.set_quoted('MODPROBE_DIR',                               modprobedir)
 conf.set_quoted('MODULESLOAD_DIR',                            modulesloaddir)
 conf.set_quoted('PKGSYSCONFDIR',                              pkgsysconfdir)
+conf.set_quoted('POLKIT_AGENT_BINARY_PATH',                   bindir / 'pkttyagent')
 conf.set_quoted('POLKIT_RULES_DIR',                           polkitrulesdir)
 conf.set_quoted('PREFIX',                                     prefixdir)
 conf.set_quoted('PREFIX_NOSLASH',                             prefixdir_noslash)

mkosi/mkosi.conf

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-MinimumVersion=commit:66d51024b7149f40be4702e84275c936373ace97
+MinimumVersion=commit:4b18ea8395e9cc2b1d247be93944f5539affe964
 Dependencies=
         minimal-base
         minimal-0

mkosi/mkosi.images/minimal-0/mkosi.conf

@@ -10,7 +10,6 @@ SplitArtifacts=yes
 [Build]
 Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
 Incremental=relaxed
-CacheOnly=metadata
 
 [Content]
 BaseTrees=%O/minimal-base

mkosi/mkosi.images/minimal-1/mkosi.conf

@@ -10,7 +10,6 @@ SplitArtifacts=yes
 [Build]
 Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
 Incremental=relaxed
-CacheOnly=metadata
 
 [Content]
 BaseTrees=%O/minimal-base

src/backlight/backlight.c

@@ -372,9 +372,6 @@ static int clamp_brightness(
         return 0;
 }
 
-/* used as the default for devices in the backlight subsystem, or when ID_BACKLIGHT_CLAMP/ID_LEDS_CLAMP=yes. */
-#define DEFAULT_CLAMP_PERCENT 1u
-
 static int shall_clamp(sd_device *device, unsigned *ret) {
         const char *property, *s;
         unsigned default_percent;
@@ -388,10 +385,10 @@ static int shall_clamp(sd_device *device, unsigned *ret) {
                 return r;
         if (r > 0) {
                 property = "ID_BACKLIGHT_CLAMP";
-                default_percent = DEFAULT_CLAMP_PERCENT;
+                default_percent = 1;
         } else {
                 property = "ID_LEDS_CLAMP";
-                default_percent = 0; /* The clamping is disabled by default. */
+                default_percent = 0;
         }
 
         r = sd_device_get_property_value(device, property, &s);
@@ -404,7 +401,7 @@ static int shall_clamp(sd_device *device, unsigned *ret) {
 
         r = parse_boolean(s);
         if (r >= 0) {
-                *ret = r ? DEFAULT_CLAMP_PERCENT : 0;
+                *ret = r ? 5 : 0;
                 return r;
         }
 

src/journal/cat.c

@@ -158,7 +158,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(r, "Failed to rearrange stdout/stderr: %m");
 
         if (argc <= optind)
-                (void) execlp("cat", "cat", NULL);
+                (void) execl("/bin/cat", "/bin/cat", NULL);
         else {
                 struct stat st;
 

src/network/networkctl-misc.c

@@ -14,149 +14,205 @@
 #include "networkctl.h"
 #include "networkctl-misc.h"
 #include "networkctl-util.h"
-#include "ordered-set.h"
 #include "parse-util.h"
 #include "polkit-agent.h"
+#include "set.h"
 #include "string-util.h"
-#include "strv.h"
 #include "varlink-util.h"
 
-static int parse_interfaces(sd_netlink **rtnl, char *argv[], OrderedSet **ret) {
+static int link_up_down_send_message(sd_netlink *rtnl, char *command, int index) {
-        _cleanup_(sd_netlink_unrefp) sd_netlink *our_rtnl = NULL;
+        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
-        _cleanup_ordered_set_free_ OrderedSet *indexes = NULL;
         int r;
 
-        assert(ret);
+        assert(rtnl);
+        assert(index >= 0);
 
-        if (!rtnl)
+        r = sd_rtnl_message_new_link(rtnl, &req, RTM_SETLINK, index);
-                rtnl = &our_rtnl;
-
-        STRV_FOREACH(s, strv_skip(argv, 1)) {
-                int index = rtnl_resolve_interface_or_warn(rtnl, *s);
-                if (index < 0)
-                        return index;
-                assert(index > 0);
-
-                r = ordered_set_ensure_put(&indexes, /* ops= */ NULL, INT_TO_PTR(index));
         if (r < 0)
-                        return log_oom();
+                return rtnl_log_create_error(r);
-        }
+
+        if (streq(command, "up"))
+                r = sd_rtnl_message_link_set_flags(req, IFF_UP, IFF_UP);
+        else
+                r = sd_rtnl_message_link_set_flags(req, 0, IFF_UP);
+        if (r < 0)
+                return log_error_errno(r, "Could not set link flags: %m");
+
+        r = sd_netlink_call(rtnl, req, 0, NULL);
+        if (r < 0)
+                return r;
 
-        *ret = TAKE_PTR(indexes);
         return 0;
 }
 
 int link_up_down(int argc, char *argv[], void *userdata) {
-        int r, ret = 0;
+        _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
-
+        _cleanup_set_free_ Set *indexes = NULL;
-        bool up = streq_ptr(argv[0], "up");
+        int index, r;
-
-        _cleanup_ordered_set_free_ OrderedSet *indexes = NULL;
-        r = parse_interfaces(/* rtnl= */ NULL, argv, &indexes);
-        if (r < 0)
-                return r;
-
-        _cleanup_(sd_varlink_flush_close_unrefp) sd_varlink *vl = NULL;
-        r = varlink_connect_networkd(&vl);
-        if (r < 0)
-                return r;
-
-        (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
-
         void *p;
-        ORDERED_SET_FOREACH(p, indexes)
-                RET_GATHER(ret, varlink_callbo_and_log(
-                                           vl,
-                                           up ? "io.systemd.Network.LinkUp" : "io.systemd.Network.LinkDown",
-                                           /* reply= */ NULL,
-                                           SD_JSON_BUILD_PAIR_INTEGER("InterfaceIndex", PTR_TO_INT(p)),
-                                           SD_JSON_BUILD_PAIR_BOOLEAN("allowInteractiveAuthentication", arg_ask_password)));
 
-        return ret;
+        r = sd_netlink_open(&rtnl);
+        if (r < 0)
+                return log_error_errno(r, "Failed to connect to netlink: %m");
+
+        indexes = set_new(NULL);
+        if (!indexes)
+                return log_oom();
+
+        for (int i = 1; i < argc; i++) {
+                index = rtnl_resolve_interface_or_warn(&rtnl, argv[i]);
+                if (index < 0)
+                        return index;
+
+                r = set_put(indexes, INT_TO_PTR(index));
+                if (r < 0)
+                        return log_oom();
         }
 
-int link_delete(int argc, char *argv[], void *userdata) {
+        SET_FOREACH(p, indexes) {
-        int r, ret = 0;
+                index = PTR_TO_INT(p);
-
+                r = link_up_down_send_message(rtnl, argv[0], index);
-        _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
-        _cleanup_ordered_set_free_ OrderedSet *indexes = NULL;
-        r = parse_interfaces(&rtnl, argv, &indexes);
                 if (r < 0)
-                return r;
+                        return log_error_errno(r, "Failed to bring %s interface %s: %m",
+                                               argv[0], FORMAT_IFNAME_FULL(index, FORMAT_IFNAME_IFINDEX));
+        }
 
-        void *p;
+        return r;
-        ORDERED_SET_FOREACH(p, indexes) {
+}
+
+static int link_delete_send_message(sd_netlink *rtnl, int index) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
-                int index = PTR_TO_INT(p);
+        int r;
+
+        assert(rtnl);
+        assert(index >= 0);
 
         r = sd_rtnl_message_new_link(rtnl, &req, RTM_DELLINK, index);
         if (r < 0)
                 return rtnl_log_create_error(r);
 
-                r = sd_netlink_call(rtnl, req, /* timeout= */ 0, /* ret= */ NULL);
+        r = sd_netlink_call(rtnl, req, 0, NULL);
-                if (r < 0) {
-                        RET_GATHER(ret, r);
-                        log_error_errno(r, "Failed to delete interface %s: %m",
-                                        FORMAT_IFNAME_FULL(index, FORMAT_IFNAME_IFINDEX));
-                }
-        }
-
-        return ret;
-}
-
-int link_bus_simple_method(int argc, char *argv[], void *userdata) {
-        int r, ret = 0;
-
-        typedef struct LinkBusAction {
-                const char *verb;
-                const char *bus_method;
-                const char *error_message;
-        } LinkBusAction;
-
-        static const LinkBusAction link_bus_action_table[] = {
-                { "renew",       "RenewLink",       "Failed to renew dynamic configuration of interface"          },
-                { "forcerenew",  "ForceRenewLink",  "Failed to forcibly renew dynamic configuration of interface" },
-                { "reconfigure", "ReconfigureLink", "Failed to reconfigure network interface"                     },
-        };
-
-        /* Common implementation for 'simple' method calls that just take an ifindex, and nothing else. */
-
-        const LinkBusAction *a = NULL;
-        FOREACH_ELEMENT(i, link_bus_action_table)
-                if (streq(argv[0], i->verb)) {
-                        a = i;
-                        break;
-                }
-        assert(a);
-
-        _cleanup_ordered_set_free_ OrderedSet *indexes = NULL;
-        r = parse_interfaces(/* rtnl= */ NULL, argv, &indexes);
         if (r < 0)
                 return r;
 
+        return 0;
+}
+
+int link_delete(int argc, char *argv[], void *userdata) {
+        _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
+        _cleanup_set_free_ Set *indexes = NULL;
+        int index, r;
+        void *p;
+
+        r = sd_netlink_open(&rtnl);
+        if (r < 0)
+                return log_error_errno(r, "Failed to connect to netlink: %m");
+
+        indexes = set_new(NULL);
+        if (!indexes)
+                return log_oom();
+
+        for (int i = 1; i < argc; i++) {
+                index = rtnl_resolve_interface_or_warn(&rtnl, argv[i]);
+                if (index < 0)
+                        return index;
+
+                r = set_put(indexes, INT_TO_PTR(index));
+                if (r < 0)
+                        return log_oom();
+        }
+
+        SET_FOREACH(p, indexes) {
+                index = PTR_TO_INT(p);
+                r = link_delete_send_message(rtnl, index);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to delete interface %s: %m",
+                                               FORMAT_IFNAME_FULL(index, FORMAT_IFNAME_IFINDEX));
+        }
+
+        return r;
+}
+
+static int link_renew_one(sd_bus *bus, int index, const char *name) {
+        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
+        int r;
+
+        assert(bus);
+        assert(index >= 0);
+        assert(name);
+
+        r = bus_call_method(bus, bus_network_mgr, "RenewLink", &error, NULL, "i", index);
+        if (r < 0)
+                return log_error_errno(r, "Failed to renew dynamic configuration of interface %s: %s",
+                                       name, bus_error_message(&error, r));
+
+        return 0;
+}
+
+int link_renew(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
+        int r;
+
         r = acquire_bus(&bus);
         if (r < 0)
                 return r;
 
         (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
 
-        void *p;
+        r = 0;
-        ORDERED_SET_FOREACH(p, indexes) {
+
+        for (int i = 1; i < argc; i++) {
+                int index;
+
+                index = rtnl_resolve_interface_or_warn(&rtnl, argv[i]);
+                if (index < 0)
+                        return index;
+
+                RET_GATHER(r, link_renew_one(bus, index, argv[i]));
+        }
+
+        return r;
+}
+
+static int link_force_renew_one(sd_bus *bus, int index, const char *name) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-                int index = PTR_TO_INT(p);
+        int r;
 
-                r = bus_call_method(bus, bus_network_mgr, a->bus_method, &error, /* ret_reply= */ NULL, "i", index);
+        assert(bus);
-                if (r < 0) {
+        assert(index >= 0);
-                        RET_GATHER(ret, r);
+        assert(name);
-                        log_error_errno(r, "%s %s: %s",
+
-                                        a->error_message,
+        r = bus_call_method(bus, bus_network_mgr, "ForceRenewLink", &error, NULL, "i", index);
-                                        FORMAT_IFNAME_FULL(index, FORMAT_IFNAME_IFINDEX),
+        if (r < 0)
-                                        bus_error_message(&error, r));
+                return log_error_errno(r, "Failed to force renew dynamic configuration of interface %s: %s",
-                }
+                                       name, bus_error_message(&error, r));
+
+        return 0;
 }
 
-        return ret;
+int link_force_renew(int argc, char *argv[], void *userdata) {
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
+        int k = 0, r;
+
+        r = acquire_bus(&bus);
+        if (r < 0)
+                return r;
+
+        (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
+
+        for (int i = 1; i < argc; i++) {
+                int index = rtnl_resolve_interface_or_warn(&rtnl, argv[i]);
+                if (index < 0)
+                        return index;
+
+                r = link_force_renew_one(bus, index, argv[i]);
+                if (r < 0 && k >= 0)
+                        k = r;
+        }
+
+        return k;
 }
 
 int verb_reload(int argc, char *argv[], void *userdata) {
@@ -177,6 +233,46 @@ int verb_reload(int argc, char *argv[], void *userdata) {
         return 0;
 }
 
+int verb_reconfigure(int argc, char *argv[], void *userdata) {
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
+        _cleanup_set_free_ Set *indexes = NULL;
+        int index, r;
+        void *p;
+
+        r = acquire_bus(&bus);
+        if (r < 0)
+                return r;
+
+        (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
+
+        indexes = set_new(NULL);
+        if (!indexes)
+                return log_oom();
+
+        for (int i = 1; i < argc; i++) {
+                index = rtnl_resolve_interface_or_warn(&rtnl, argv[i]);
+                if (index < 0)
+                        return index;
+
+                r = set_put(indexes, INT_TO_PTR(index));
+                if (r < 0)
+                        return log_oom();
+        }
+
+        SET_FOREACH(p, indexes) {
+                index = PTR_TO_INT(p);
+                r = bus_call_method(bus, bus_network_mgr, "ReconfigureLink", &error, NULL, "i", index);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to reconfigure network interface %s: %s",
+                                               FORMAT_IFNAME_FULL(index, FORMAT_IFNAME_IFINDEX),
+                                               bus_error_message(&error, r));
+        }
+
+        return 0;
+}
+
 int verb_persistent_storage(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_varlink_flush_close_unrefp) sd_varlink *vl = NULL;
         bool ready;

src/network/networkctl-misc.h

@@ -3,6 +3,8 @@
 
 int link_up_down(int argc, char *argv[], void *userdata);
 int link_delete(int argc, char *argv[], void *userdata);
-int link_bus_simple_method(int argc, char *argv[], void *userdata);
+int link_renew(int argc, char *argv[], void *userdata);
+int link_force_renew(int argc, char *argv[], void *userdata);
 int verb_reload(int argc, char *argv[], void *userdata);
+int verb_reconfigure(int argc, char *argv[], void *userdata);
 int verb_persistent_storage(int argc, char *argv[], void *userdata);

src/network/networkctl.c

@@ -230,9 +230,9 @@ static int networkctl_main(int argc, char *argv[]) {
                 { "delete",             2,        VERB_ANY, 0,                             link_delete             },
                 { "up",                 2,        VERB_ANY, 0,                             link_up_down            },
                 { "down",               2,        VERB_ANY, 0,                             link_up_down            },
-                { "renew",              2,        VERB_ANY, VERB_ONLINE_ONLY,              link_bus_simple_method  },
+                { "renew",              2,        VERB_ANY, VERB_ONLINE_ONLY,              link_renew              },
-                { "forcerenew",         2,        VERB_ANY, VERB_ONLINE_ONLY,              link_bus_simple_method  },
+                { "forcerenew",         2,        VERB_ANY, VERB_ONLINE_ONLY,              link_force_renew        },
-                { "reconfigure",        2,        VERB_ANY, VERB_ONLINE_ONLY,              link_bus_simple_method  },
+                { "reconfigure",        2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_reconfigure        },
                 { "reload",             1,        1,        VERB_ONLINE_ONLY,              verb_reload             },
                 { "edit",               2,        VERB_ANY, 0,                             verb_edit               },
                 { "cat",                1,        VERB_ANY, 0,                             verb_cat                },

src/nspawn/nspawn-setuid.c

@@ -38,7 +38,8 @@ static int spawn_getent(const char *database, const char *key, PidRef *ret) {
                 return r;
         }
         if (r == 0) {
-                execlp("getent", "getent", database, key, NULL);
+                execle("/usr/bin/getent", "getent", database, key, NULL, &(char*[1]){});
+                execle("/bin/getent", "getent", database, key, NULL, &(char*[1]){});
                 _exit(EXIT_FAILURE);
         }
 

src/shared/polkit-agent.c

@@ -3,13 +3,11 @@
 #include <poll.h>
 #include <unistd.h>
 
-#include "alloc-util.h"
 #include "bus-util.h"
 #include "exec-util.h"
 #include "fd-util.h"
 #include "io-util.h"
 #include "log.h"
-#include "path-util.h"
 #include "pidref.h"
 #include "polkit-agent.h"
 #include "stdio-util.h"
@@ -33,15 +31,6 @@ int polkit_agent_open(void) {
         if (r <= 0)
                 return r;
 
-        _cleanup_free_ char *pkttyagent = NULL;
-        r = find_executable("pkttyagent", &pkttyagent);
-        if (r == -ENOENT) {
-                log_debug("pkttyagent binary not available, ignoring.");
-                return 0;
-        }
-        if (r < 0)
-                return log_error_errno(r, "Failed to determine whether pkttyagent binary exists: %m");
-
         if (pipe2(pipe_fd, 0) < 0)
                 return -errno;
 
@@ -51,7 +40,7 @@ int polkit_agent_open(void) {
                        &pipe_fd[1],
                        1,
                        &agent_pidref,
-                       pkttyagent,
+                       POLKIT_AGENT_BINARY_PATH,
                        "--notify-fd", notify_fd,
                        "--fallback");
         if (r < 0)

units/ldconfig.service

@@ -25,4 +25,4 @@ Before=shutdown.target initrd-switch-root.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=ldconfig -X
+ExecStart=/sbin/ldconfig -X

units/modprobe@.service

@@ -32,4 +32,4 @@ StartLimitIntervalSec=0
 
 [Service]
 Type=oneshot
-ExecStart=-modprobe -abq %i
+ExecStart=-/sbin/modprobe -abq %i