core: Remove explicit Plymouth integration

Even if plymouth is running, it might have not displayed the splash yet,
so we'll see a few lines on fbcon when we should have otherwise had
nothing.

Plymouth integration was added to systemd in commit
6faa11140bf776cdaeb8d22d01816e6e48296971. That same day, Plymouth got
systemd integration [0]. As such, the Plymouth integration has always
been obsolete, and was probably only for older Plymouth's. But I can't
imagine anybody running a Plymouth from 2011 with a systemd from 2015.

Remove the Plymouth/systemd integration, and let Plymouth's code tell
systemd to print the details.

[0] http://cgit.freedesktop.org/plymouth/commit/?id=537c16422cd49f1beeaab1ad39846a00018faec1

Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Cc: Daniel Drake <dsd@endlessm.com>
Cc: Ray Strode <rstrode@redhat.com>

diff --git a/src/core/main.c b/src/core/main.c
index 2d393deb9eec87f31534f275f6d56e34f07b5839..dd8b65083bf9bfd3844d20d492cdf074800463b3 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1561,7 +1561,7 @@ int main(int argc, char *argv[]) {
         }
 
         if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) {
-                if (arg_show_status > 0 || plymouth_running())
+                if (arg_show_status > 0)
                         status_welcome();
 
                 hostname_setup();

diff --git a/src/core/manager.c b/src/core/manager.c
index d33112df2f3699af4db9c3a5a812bd97c6c578e8..1afd359df256a78787a7672ae3d4300a3a1e6c5e 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3009,9 +3009,7 @@ static bool manager_get_show_status(Manager *m, StatusType type) {
         if (m->show_status > 0)
                 return true;
 
-        /* If Plymouth is running make sure we show the status, so
-         * that there's something nice to see when people press Esc */
-        return plymouth_running();
+        return false;
 }
 
 void manager_set_first_boot(Manager *m, bool b) {

diff --git a/src/shared/util.c b/src/shared/util.c
index 5cbbe8fb7d2886ffbbe36fab7cde07aba50fbe2c..3f3ca90f5d7e8b72e47ae96df6f18977049b2f0e 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4228,10 +4228,6 @@ bool nulstr_contains(const char*nulstr, const char *needle) {
         return false;
 }
 
-bool plymouth_running(void) {
-        return access("/run/plymouth/pid", F_OK) >= 0;
-}
-
 char* strshorten(char *s, size_t l) {
         assert(s);
 

diff --git a/src/shared/util.h b/src/shared/util.h
index d229e1e68c95ac447462255fdf7907900f8b9482..749bd0ea853c61f3c4a28b8d139c5de2ff48dea8 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -549,8 +549,6 @@ int kill_and_sigcont(pid_t pid, int sig);
 
 bool nulstr_contains(const char*nulstr, const char *needle);
 
-bool plymouth_running(void);
-
 bool hostname_is_valid(const char *s) _pure_;
 char* hostname_cleanup(char *s, bool lowercase);