Merge c6c73d561a into 5b2926d941

Similar to c5ecf09494, but for io event source.

Fixes #35322.

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();

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();