Merge c6c73d561a into 5b2926d941

curl-util: do not configure new io event source when the event loop is already dead
Similar to c5ecf09494, but for io event source. Fixes #35322.
2024-11-23 21:49:58 -08:00 · 2024-11-23 22:49:57 +01:00 · 2024-05-06 18:52:23 +02:00
2 changed files with 9 additions and 1 deletions
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@ -75,6 +75,10 @@ static int curl_glue_socket_callback(CURL *curl, curl_socket_t s, int action, vo
                return 0;
        }

+        /* Don't configure io event source anymore when the event loop is dead already. */
+        if (g->event && sd_event_get_state(g->event) == SD_EVENT_FINISHED)
+                return 0;
+
        r = hashmap_ensure_allocated(&g->ios, &trivial_hash_ops);
        if (r < 0) {
                log_oom();
--- a/src/storagetm/storagetm.c
+++ b/src/storagetm/storagetm.c
@ -732,9 +732,13 @@ static int plymouth_send_text(const char *text) {
        assert(text);

        c = asprintf(&plymouth_message,
+                     "r%c"  /* reactivate */
                     "M\x02%c%s%c"
-                     "A%c", /* pause spinner */
+                     "A%c"  /* pause spinner */
+                     "D%c", /* deactivate */
+                     '\x00',
                     (int) strlen(text) + 1, text, '\x00',
+                     '\x00',
                     '\x00');
        if (c < 0)
                return log_oom();
Author	SHA1	Message	Date
Lennart Poettering	d26d972c03	Merge `c6c73d561a` into `5b2926d941`	2024-11-23 21:49:58 -08:00
Yu Watanabe	5b2926d941	curl-util: do not configure new io event source when the event loop is already dead Similar to `c5ecf09494`, but for io event source. Fixes #35322.	2024-11-23 22:49:57 +01:00
Lennart Poettering	c6c73d561a	storagetm: make the spinner stop by deactivating plymouth after we output our message As suggested here: https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/223#note_2171647	2024-05-06 18:52:23 +02:00