From 031886edfc6e96ab778c241035a8d00fb0de99d3 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 16 Mar 2015 09:34:59 -0700 Subject: 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 Cc: Daniel Drake Cc: Ray Strode --- src/shared/util.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/shared/util.h') 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); -- cgit v1.2.3-54-g00ecf