Merge c6c73d561a into c946b13575

link README.logs from tmpfiles.d/legacy.conf only if available
The file README.logs is installed only if SysVInit support is enabled. Thus the link should depend on it as well.
2024-11-22 21:39:27 -08:00 · 2024-11-22 18:33:20 +00:00 · 2024-05-06 18:52:23 +02:00
2 changed files with 7 additions and 2 deletions
--- 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();
--- a/tmpfiles.d/legacy.conf.in
+++ b/tmpfiles.d/legacy.conf.in
@ -13,11 +13,12 @@

 d /run/lock 0755 root root -
 L /var/lock - - - - ../run/lock
+
+{% if HAVE_SYSV_COMPAT %}
 {% if CREATE_LOG_DIRS %}
 L$ /var/log/README - - - - ../..{{DOC_DIR}}/README.logs
 {% endif %}

-{% if HAVE_SYSV_COMPAT %}
 # /run/lock/subsys is used for serializing SysV service execution, and
 # hence without use on SysV-less systems.
 d /run/lock/subsys 0755 root root -
Author	SHA1	Message	Date
Lennart Poettering	c39053faa2	Merge `c6c73d561a` into `c946b13575`	2024-11-22 21:39:27 -08:00
Christian Hesse	c946b13575	link README.logs from tmpfiles.d/legacy.conf only if available The file README.logs is installed only if SysVInit support is enabled. Thus the link should depend on it as well.	2024-11-22 18:33:20 +00: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