clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-15 02:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fscd: fix error handling

Browse Source
This commit is contained in:
Lennart Poettering
2015-03-09 18:30:37 +01:00
parent 3963cea3b0
commit e9d2527ff4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fsckd/fsckd.c
+11 -4
View File
@@ -173,25 +173,32 @@ static int send_message_plymouth_socket(int plymouth_fd, const char *message, bo
}
static int send_message_plymouth(Manager *m, const char *message) {
int r;
const char *plymouth_cancel_message = NULL;
int r;
r = connect_plymouth(m);
if (r < 0)
return r;
if (!m->plymouth_cancel_sent) {
/* indicate to plymouth that we listen to Ctrl+C */
/* Indicate to plymouth that we listen to Ctrl+C */
r = loop_write(m->plymouth_fd, PLYMOUTH_REQUEST_KEY, sizeof(PLYMOUTH_REQUEST_KEY), true);
if (r < 0)
return log_warning_errno(errno, "Can't send to plymouth cancel key: %m");
return log_warning_errno(r, "Can't send to plymouth cancel key: %m");
m->plymouth_cancel_sent = true;
plymouth_cancel_message = strjoina("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress"));
r = send_message_plymouth_socket(m->plymouth_fd, plymouth_cancel_message, false);
if (r < 0)
log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m");
} else if (m->numdevices == 0) {
m->plymouth_cancel_sent = false;
r = send_message_plymouth_socket(m->plymouth_fd, "", false);
if (r < 0)
log_warning_errno(r, "Can't clear plymouth filesystem cancel message: %m");
@@ -199,7 +206,7 @@ static int send_message_plymouth(Manager *m, const char *message) {
r = send_message_plymouth_socket(m->plymouth_fd, message, true);
if (r < 0)
return log_warning_errno(errno, "Couldn't send \"%s\" to plymouth: %m", message);
return log_warning_errno(r, "Couldn't send \"%s\" to plymouth: %m", message);
return 0;
}