.github/copilot-instructions.md

@@ -14,20 +14,6 @@ Always include the following files in the context:
 
 Include any other files from the [documentation](../docs) in the context as needed based on whether you think it might be helpful to solve your current task or help to review the current PR.
 
-## Build + Test instructions
-
-**CRITICAL: Read and follow these instructions exactly.**
-
-- **NEVER** compile individual files or targets. **ALWAYS** run `mkosi -f box meson compile -C build` to build the entire project. Meson handles incremental compilation automatically.
-- **NEVER** run `meson compile` followed by `meson test` as separate steps. **ALWAYS** run `mkosi -f box meson test -C build -v <TEST-NAME>` directly. Meson will automatically rebuild any required targets before running tests.
-- **NEVER** invent your own build commands or try to optimize the build process.
-- **NEVER** use `head`, `tail`, or pipe (`|`) the output of build or test commands. Always let the full output display. This is critical for diagnosing build and test failures.
-- When asked to build and test code changes:
-  - **CORRECT**: Run `mkosi -f box -- meson test -C build -v <TEST-NAME>` (this builds and runs tests in one command)
-  - **WRONG**: Run `mkosi -f box -- meson compile -C build` followed by `mkosi -f box -- meson test -C build -v <TEST-NAME>`
-  - **WRONG**: Run `mkosi -f box -- meson compile -C build src/core/systemd` or similar individual target compilation
-  - **WRONG**: Run `mkosi -f box -- meson test -C build -v <TEST-NAME> 2>&1 | tail -100` or similar piped commands
-
 ## Pull Request review instructions
 
 - Focus on making sure the coding style is followed as documented in `docs/CODING_STYLE.md`

NEWS

@@ -100,7 +100,7 @@ CHANGES WITH 259 in spe:
           points to its own PID can now also verify the pidfd inode ID, which
           does not recycle IDs.
 
-        * The log message made when a service exits will now show the
+        * The log message made when a service exists will now show the
           wallclock time the service took in addition to the previously shown
           CPU time.
 

docs/CODING_STYLE.md

@@ -583,8 +583,8 @@ SPDX-License-Identifier: LGPL-2.1-or-later
   code. (With one exception: it is OK to log with DEBUG level from any code,
   with the exception of maybe inner loops).
 
-- In libsystemd public API calls, you **must** validate all your input arguments
+- In public API calls, you **must** validate all your input arguments for
-  for programming error with `assert_return()` and return a sensible return
+  programming error with `assert_return()` and return a sensible return
   code. In all other calls, it is recommended to check for programming errors
   with a more brutal `assert()`. We are more forgiving to public users than for
   ourselves! Note that `assert()` and `assert_return()` really only should be
@@ -982,8 +982,5 @@ SPDX-License-Identifier: LGPL-2.1-or-later
   macro exists for your specific use case, please add a new assertion macro in a
   separate commit.
 
-- Use `ASSERT_OK_ERRNO()` and similar macros instead of `ASSERT_OK()` when
-  calling glibc APIs that return the error in `errno`.
-
 - When modifying existing tests, please convert the test to use the new assertion
   macros from `tests.h` if it is not already using those.

docs/HACKING.md

@@ -39,11 +39,11 @@ chance that your distribution's packaged version of mkosi will be too old.
 Then, you can build, run and test systemd executables as follows:
 
 ```sh
-$ mkosi -f genkey                                            # Generate signing keys once.
+$ mkosi -f genkey                                  # Generate signing keys once.
 $ mkosi -f box -- meson setup -Dbpf-framework=disabled build # bpftool detection inside mkosi box is broken on Ubuntu Noble and older
 $ mkosi -f box -- meson compile -C build
 $ mkosi -f box -- build/systemctl --version
-$ mkosi -f box -- meson test -C build --print-errorlogs      # Run the unit tests
+$ mkosi -f box -- meson test -C build          # Run the unit tests
 ```
 
 To build and boot an OS image with the latest systemd installed:

mkosi/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf

@@ -13,6 +13,3 @@ Packages=
         clang-tools-extra
         python3-mypy
         rpm-build
-        libasan
-        libubsan
-        compiler-rt

src/home/homed-home.c

@@ -2189,7 +2189,7 @@ void home_process_notify(Home *h, char **l, int fd) {
                         return (void) log_debug_errno(r, "Failed to parse SYSTEMD_LUKS_LOCK_FD value: %m");
                 if (r > 0) {
                         if (taken_fd < 0)
-                                return (void) log_debug("Got notify message with SYSTEMD_LUKS_LOCK_FD=1 but no fd passed, ignoring.");
+                                return (void) log_debug("Got notify message with SYSTEMD_LUKS_LOCK_FD=1 but no fd passed, ignoring: %m");
 
                         close_and_replace(h->luks_lock_fd, taken_fd);
 
@@ -2199,7 +2199,7 @@ void home_process_notify(Home *h, char **l, int fd) {
                         home_maybe_close_luks_lock_fd(h, _HOME_STATE_INVALID);
                 } else {
                         if (taken_fd >= 0)
-                                return (void) log_debug("Got notify message with SYSTEMD_LUKS_LOCK_FD=0 but fd passed, ignoring.");
+                                return (void) log_debug("Got notify message with SYSTEMD_LUKS_LOCK_FD=0 but fd passed, ignoring: %m");
 
                         h->luks_lock_fd = safe_close(h->luks_lock_fd);
                 }

src/network/networkd-ipv4ll.c

@@ -155,7 +155,7 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
                 case SD_IPV4LL_EVENT_BIND:
                         r = ipv4ll_address_claimed(ll, link);
                         if (r < 0) {
-                                log_link_error_errno(link, r, "Failed to configure ipv4ll address: %m");
+                                log_link_error(link, "Failed to configure ipv4ll address: %m");
                                 link_enter_failed(link);
                                 return;
                         }

src/network/networkd-nexthop.c

@@ -1123,7 +1123,7 @@ int manager_rtnl_process_nexthop(sd_netlink *rtnl, sd_netlink_message *message,
                 log_warning_errno(r, "rtnl: could not get NHA_ID attribute, ignoring: %m");
                 return 0;
         } else if (id == 0) {
-                log_warning("rtnl: received nexthop message with invalid nexthop ID, ignoring.");
+                log_warning("rtnl: received nexthop message with invalid nexthop ID, ignoring: %m");
                 return 0;
         }
 

src/network/networkd-resolve-hook.c

@@ -5,14 +5,12 @@
 #include "sd-varlink.h"
 
 #include "alloc-util.h"
-#include "argv-util.h"
 #include "dns-answer.h"
 #include "dns-domain.h"
 #include "dns-packet.h"
 #include "dns-question.h"
 #include "dns-rr.h"
 #include "env-util.h"
-#include "errno-util.h"
 #include "fd-util.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
@@ -216,14 +214,17 @@ int manager_varlink_init_resolve_hook(Manager *m, int fd) {
         if (m->varlink_resolve_hook_server)
                 return 0;
 
-        if (fd < 0 && invoked_by_systemd()) {
+        r = getenv_bool("SYSTEMD_NETWORK_RESOLVE_HOOK");
-                log_debug("systemd-networkd-resolve-hook.socket seems to be disabled, not installing varlink server.");
+        if (r < 0 && r != -ENXIO)
+                log_warning_errno(r, "Failed to parse $SYSTEMD_NETWORK_RESOLVE_HOOK, ignoring: %m");
+        if (r == 0) {
+                log_notice("Resolve hook disabled via $SYSTEMD_NETWORK_RESOLVE_HOOK.");
                 return 0;
         }
 
         r = varlink_server_new(&s, SD_VARLINK_SERVER_ACCOUNT_UID|SD_VARLINK_SERVER_INHERIT_USERDATA, m);
         if (r < 0)
-                return log_error_errno(r, "Failed to allocate varlink server: %m");
+                return log_error_errno(r, "Failed to allocate varlink server object: %m");
 
         (void) sd_varlink_server_set_description(s, "varlink-resolve-hook");
 
@@ -242,17 +243,12 @@ int manager_varlink_init_resolve_hook(Manager *m, int fd) {
         if (r < 0)
                 return log_error_errno(r, "Failed to bind on resolve hook disconnection events: %m");
 
-        if (fd < 0) {
+        if (fd < 0)
-                r = sd_varlink_server_listen_address(s, "/run/systemd/resolve.hook/io.systemd.Network",
+                r = sd_varlink_server_listen_address(s, "/run/systemd/resolve.hook/io.systemd.Network", 0666 | SD_VARLINK_SERVER_MODE_MKDIR_0755);
-                                                     0666 | SD_VARLINK_SERVER_MODE_MKDIR_0755);
+        else
-                if (ERRNO_IS_NEG_PRIVILEGE(r)) {
-                        log_info_errno(r, "Failed to bind to systemd-resolved hook varlink socket, ignoring: %m");
-                        return 0;
-                }
-        } else
                 r = sd_varlink_server_listen_fd(s, fd);
         if (r < 0)
-                return log_error_errno(r, "Failed to bind to systemd-resolved hook varlink socket: %m");
+                return log_error_errno(r, "Failed to bind to systemd-resolved hook Varlink socket: %m");
 
         TAKE_FD(fd_close);
 

src/network/networkd-wifi.c

@@ -119,7 +119,7 @@ int manager_genl_process_nl80211_config(sd_netlink *genl, sd_netlink_message *me
         }
 
         if (!streq(ifname, link->ifname)) {
-                log_link_debug(link, "nl80211: received %s(%u) message with invalid interface name '%s', ignoring.",
+                log_link_debug(link, "nl80211: received %s(%u) message with invalid interface name '%s', ignoring: %m",
                                strna(nl80211_cmd_to_string(cmd)), cmd, ifname);
                 return 0;
         }
@@ -139,7 +139,7 @@ int manager_genl_process_nl80211_config(sd_netlink *genl, sd_netlink_message *me
         }
         if (r >= 0) {
                 if (len == 0) {
-                        log_link_debug(link, "nl80211: received SSID has zero length, ignoring it.");
+                        log_link_debug(link, "nl80211: received SSID has zero length, ignoring it: %m");
                         ssid = mfree(ssid);
                 } else if (strlen_ptr(ssid) != len) {
                         log_link_debug(link, "nl80211: received SSID contains NUL characters, ignoring it.");

src/network/networkd-wiphy.c

@@ -409,7 +409,8 @@ int manager_genl_process_nl80211_wiphy(sd_netlink *genl, sd_netlink_message *mes
         (void) wiphy_get_by_index(manager, index, &w);
 
         switch (cmd) {
-        case NL80211_CMD_NEW_WIPHY:
+        case NL80211_CMD_NEW_WIPHY: {
+
                 if (!w) {
                         r = wiphy_new(manager, message, &w);
                         if (r < 0) {
@@ -431,10 +432,11 @@ int manager_genl_process_nl80211_wiphy(sd_netlink *genl, sd_netlink_message *mes
                         log_wiphy_warning_errno(w, r, "Failed to update wiphy, ignoring: %m");
 
                 break;
-
+        }
         case NL80211_CMD_DEL_WIPHY:
+
                 if (!w) {
-                        log_debug("The kernel removed wiphy we do not know, ignoring.");
+                        log_debug("The kernel removes wiphy we do not know, ignoring: %m");
                         return 0;
                 }
 
@@ -443,7 +445,7 @@ int manager_genl_process_nl80211_wiphy(sd_netlink *genl, sd_netlink_message *mes
                 break;
 
         default:
-                log_wiphy_debug(w, "nl80211: received %s(%u) message, ignoring.",
+                log_wiphy_debug(w, "nl80211: received %s(%u) message.",
                                 strna(nl80211_cmd_to_string(cmd)), cmd);
         }
 

src/shared/discover-image.c

@@ -844,7 +844,7 @@ int image_find(RuntimeScope scope,
                                         continue;
                                 }
                                 if (!result.path) {
-                                        log_debug("Found versioned directory '%s', without matching entry, skipping.", vp);
+                                        log_debug("Found versioned directory '%s', without matching entry, skipping: %m", vp);
                                         continue;
                                 }
 
@@ -1052,7 +1052,7 @@ int image_discover(
                                                 continue;
                                         }
                                         if (!result.path) {
-                                                log_debug("Found versioned directory '%s', without matching entry, skipping.", vp);
+                                                log_debug("Found versioned directory '%s', without matching entry, skipping: %m", vp);
                                                 continue;
                                         }
 

src/shared/fork-notify.c

@@ -77,7 +77,7 @@ static int on_child_notify(sd_event_source *s, int fd, uint32_t revents, void *u
                         return 0;
                 }
                 if (error <= 0) {
-                        log_debug("Received non-positive ERRNO= notification message, ignoring: %d", error);
+                        log_debug("Received non-positive ERRNO= notification message, ignoring: %m");
                         return 0;
                 }
 

src/udev/net/link-config.c

@@ -917,7 +917,7 @@ static int link_apply_sr_iov_config(Link *link) {
                 return 0;
         }
         if (n == 0) {
-                log_link_warning(link, "No SR-IOV virtual functions exist, ignoring all [SR-IOV] sections.");
+                log_link_warning(link, "No SR-IOV virtual function exists, ignoring all [SR-IOV] sections: %m");
                 return 0;
         }
 

test/networkd-test.py

@@ -97,6 +97,9 @@ def setUpModule():
     if os.path.isdir('/run/systemd/resolve'):
         os.chmod('/run/systemd/resolve', 0o755)
         shutil.chown('/run/systemd/resolve', 'systemd-resolve', 'systemd-resolve')
+    if os.path.isdir('/run/systemd/resolve.hook'):
+        os.chmod('/run/systemd/resolve.hook', 0o755)
+        shutil.chown('/run/systemd/resolve.hook', 'systemd-network', 'systemd-network')
     if os.path.isdir('/run/systemd/netif'):
         os.chmod('/run/systemd/netif', 0o755)
         shutil.chown('/run/systemd/netif', 'systemd-network', 'systemd-network')
@@ -973,6 +976,9 @@ EOF
 # Hence, 'networkctl persistent-storage yes' cannot be used.
 export SYSTEMD_NETWORK_PERSISTENT_STORAGE_READY=1
 
+# Don't try to register resolved hook for our testcase
+export SYSTEMD_NETWORK_RESOLVE_HOOK=0
+
 # Generate debugging logs.
 export SYSTEMD_LOG_LEVEL=debug
 

test/units/TEST-07-PID1.socket-defer.sh

@@ -71,18 +71,16 @@ assert_eq "$(systemctl show "$UNIT_NAME.socket" -P SubState)" "listening"
 (! systemctl -q is-active "$UNIT_NAME.service")
 
 socat -u - UNIX-CONNECT:"/tmp/$UNIT_NAME/test" &
-PID=$!
 wait_for_start
-wait $PID
+wait %%
 
 touch "/tmp/$UNIT_NAME/flag"
 systemctl start "$UNIT_NAME-conflict2.service"
 wait_for_stop
 
 socat -u - UNIX-CONNECT:"/tmp/$UNIT_NAME/test" &
-PID=$!
 wait_for_start
-wait $PID
+wait %%
 (! systemctl -q is-active "$UNIT_NAME-conflict2.service")
 
 # DeferTrigger=yes
@@ -99,10 +97,9 @@ assert_eq "$(systemctl show "$UNIT_NAME-conflict1.service" -P SubState)" "start"
 # Wait in "deferred" state
 
 socat -u - UNIX-CONNECT:"/tmp/$UNIT_NAME/test" &
-PID=$!
 timeout 30 bash -c "until [[ \$(systemctl show '$UNIT_NAME.socket' -P SubState) == 'deferred' ]]; do sleep .5; done"
 (! systemctl -q is-active "$UNIT_NAME.service")
-wait $PID
+wait %%
 assert_eq "$(systemctl show "$UNIT_NAME-conflict1.service" -P SubState)" "start"
 
 systemctl daemon-reload
@@ -123,10 +120,9 @@ systemctl start "$UNIT_NAME-conflict2.service"
 wait_for_stop
 
 socat -u - UNIX-CONNECT:"/tmp/$UNIT_NAME/test" &
-PID=$!
 timeout 30 bash -c "until [[ \$(systemctl show '$UNIT_NAME.socket' -P SubState) == 'deferred' ]]; do sleep .5; done"
 (! systemctl -q is-active "$UNIT_NAME.service")
-wait $PID
+wait %%
 
 rm "/tmp/$UNIT_NAME/flag"
 timeout 30 bash -c "while systemctl -q is-active '$UNIT_NAME-conflict2.service'; do sleep .2; done"
@@ -140,10 +136,9 @@ wait_for_stop
 assert_eq "$(systemctl show "$UNIT_NAME-conflict1.service" -P SubState)" "start"
 
 socat -u - UNIX-CONNECT:"/tmp/$UNIT_NAME/test" &
-PID=$!
 timeout 30 bash -c "until [[ \$(systemctl show '$UNIT_NAME.socket' -P SubState) == 'deferred' ]]; do sleep .5; done"
 (! systemctl -q is-active "$UNIT_NAME.service")
-wait $PID
+wait %%
 
 echo "DeferTriggerMaxSec=20s" >>/run/systemd/system/"$UNIT_NAME.socket"
 systemctl daemon-reload