From 19e887e709c31ee4366ec44a770d3963cd48cb86 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 26 Jan 2015 16:01:11 +0100 Subject: systemd-fsck: always connect to systemd-fsckd Remove the plymouth running or show-status checks from systemd-fsck. Instead, always connect to systemd-fsckd socket, and let this one decide if we display progress or not. --- src/fsckd/fsckd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/fsckd') diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c index 39fe899b99..6b2eeb067f 100644 --- a/src/fsckd/fsckd.c +++ b/src/fsckd/fsckd.c @@ -259,9 +259,11 @@ static int manager_new(Manager **ret, int fd) { return r; m->connection_fd = fd; - m->console = fopen("/dev/console", "we"); - if (!m->console) - return log_warning_errno(errno, "Can't connect to /dev/console: %m"); + if (access("/run/systemd/show-status", F_OK) >= 0) { + m->console = fopen("/dev/console", "we"); + if (!m->console) + return log_warning_errno(errno, "Can't connect to /dev/console: %m"); + } m->percent = 100; *ret = m; -- cgit v1.2.3-54-g00ecf