diff options
author | Didier Roche <didrocks@ubuntu.com> | 2015-01-26 16:01:11 +0100 |
---|---|---|
committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-18 16:33:46 +0100 |
commit | 19e887e709c31ee4366ec44a770d3963cd48cb86 (patch) | |
tree | 8e629b2391aa63ca0560da658536547e25494f48 /src/fsckd | |
parent | ac6e2f0dfc2e800f01c79ecea2b811914110a7b9 (diff) |
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.
Diffstat (limited to 'src/fsckd')
-rw-r--r-- | src/fsckd/fsckd.c | 8 |
1 files changed, 5 insertions, 3 deletions
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; |