diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2015-03-16 09:34:59 -0700 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-03-16 17:47:27 +0100 |
| commit | 031886edfc6e96ab778c241035a8d00fb0de99d3 (patch) | |
| tree | 69cce77ebb0d992549ae732f18766a15e8c28d3b | |
| parent | b17de8449c3ce26031d5bb7dec1086b56e51ac9b (diff) | |
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>
| -rw-r--r-- | src/core/main.c | 2 | ||||
| -rw-r--r-- | src/core/manager.c | 4 | ||||
| -rw-r--r-- | src/shared/util.c | 4 | ||||
| -rw-r--r-- | src/shared/util.h | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/core/main.c b/src/core/main.c index 2d393deb9e..dd8b65083b 100644 --- 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 d33112df2f..1afd359df2 100644 --- 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 5cbbe8fb7d..3f3ca90f5d 100644 --- 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 d229e1e68c..749bd0ea85 100644 --- 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); |