From 00085ba6c2837bba10a25ea38cc9ead065867f2c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 13 Aug 2025 14:35:51 +0900 Subject: [PATCH] import,sysupdate: make notify event processed before SIGCHLD of worker processes This fixes the following warning: ``` [ 5.628796] TEST-13-NSPAWN.sh[299]: + importctl import-raw --class=confext /var/tmp/importtest (snip) [ 5.638894] systemd-importd[302]: (transfer1) Operation completed successfully. [ 5.640760] TEST-13-NSPAWN.sh[318]: ^MTotal: 0%^MTotal: 40% [ 5.638902] systemd-importd[302]: (transfer1) Exiting. [ 5.638931] systemd-importd[302]: Got percentage from client: 40% [ 5.638956] systemd-importd[302]: Transfer process succeeded. [ 5.638988] systemd-importd[302]: Got notification datagram from unexpected peer, ignoring. ``` --- src/import/importd.c | 2 +- src/sysupdate/sysupdated.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/import/importd.c b/src/import/importd.c index 84cc9ca86a..f2715691ab 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -721,7 +721,7 @@ static int manager_new(Manager **ret) { r = notify_socket_prepare( m->event, - SD_EVENT_PRIORITY_NORMAL, + SD_EVENT_PRIORITY_NORMAL - 1, /* Make this processed before SIGCHLD. */ manager_on_notify, m, &m->notify_socket_path); diff --git a/src/sysupdate/sysupdated.c b/src/sysupdate/sysupdated.c index cc45ca0657..b1438ff825 100644 --- a/src/sysupdate/sysupdated.c +++ b/src/sysupdate/sysupdated.c @@ -1746,7 +1746,7 @@ static int manager_new(Manager **ret) { r = notify_socket_prepare( m->event, - SD_EVENT_PRIORITY_NORMAL, + SD_EVENT_PRIORITY_NORMAL - 1, /* Make this processed before SIGCHLD. */ manager_on_notify, m, &m->notify_socket_path);