#include <getopt.h>
#include <errno.h>
+#include <libintl.h>
#include <math.h>
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
#include "build.h"
+#include "def.h"
#include "event-util.h"
#include "fsckd.h"
#include "log.h"
#include "util.h"
#define IDLE_TIME_SECONDS 30
+#define PLYMOUTH_REQUEST_KEY "K\2\2\3"
struct Manager;
int pass;
double percent;
size_t buflen;
+ bool cancelled;
LIST_FIELDS(struct Client, clients);
} Client;
FILE *console;
double percent;
int numdevices;
+ int plymouth_fd;
+ bool plymouth_cancel_sent;
+ bool cancel_requested;
} Manager;
+static int connect_plymouth(Manager *m);
+static int update_global_progress(Manager *m);
static void manager_free(Manager *m);
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
#define _cleanup_manager_free_ _cleanup_(manager_freep)
(double) cur / max;
}
+static int request_cancel_client(Client *current) {
+ FsckdMessage cancel_msg;
+ ssize_t n;
+ cancel_msg.cancel = 1;
+
+ n = send(current->fd, &cancel_msg, sizeof(FsckdMessage), 0);
+ if (n < 0 || (size_t) n < sizeof(FsckdMessage))
+ return log_warning_errno(n, "Cannot send cancel to fsck on (%u, %u): %m",
+ major(current->devnum), minor(current->devnum));
+ else
+ current->cancelled = true;
+ return 0;
+}
static void remove_client(Client **first, Client *item) {
LIST_REMOVE(clients, *first, item);
free(item);
}
+static void on_plymouth_disconnect(Manager *m) {
+ safe_close(m->plymouth_fd);
+ m->plymouth_fd = -1;
+ m->plymouth_cancel_sent = false;
+}
+
+static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
+ Client *current;
+ char buffer[6];
+ int r;
+
+ assert(m);
+
+ r = read(m->plymouth_fd, buffer, sizeof(buffer));
+ if (r <= 0)
+ on_plymouth_disconnect(m);
+ else {
+ if (buffer[0] == '\15')
+ log_error("Message update to plymouth wasn't delivered successfully");
+
+ /* the only answer support type we requested is a key interruption */
+ if (buffer[0] == '\2' && buffer[5] == '\3') {
+ m->cancel_requested = true;
+ /* cancel all connected clients */
+ LIST_FOREACH(clients, current, m->clients)
+ request_cancel_client(current);
+ }
+ }
+
+ return 0;
+}
+
+static int send_message_plymouth_socket(int plymouth_fd, const char *message, bool update) {
+ _cleanup_free_ char *packet = NULL;
+ int r, n;
+ char mode = 'M';
+
+ if (update)
+ mode = 'U';
+
+ if (asprintf(&packet, "%c\002%c%s%n", mode, (int) (strlen(message) + 1), message, &n) < 0)
+ return log_oom();
+ r = loop_write(plymouth_fd, packet, n + 1, true);
+ return r;
+}
+
+
+static int send_message_plymouth(Manager *m, const char *message) {
+ int r;
+ const char *plymouth_cancel_message = NULL;
+
+ r = connect_plymouth(m);
+ if (r < 0)
+ return r;
+
+ if (!m->plymouth_cancel_sent) {
+ /* 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");
+ 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");
+ }
+
+ 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 0;
+}
+
static int update_global_progress(Manager *m) {
Client *current = NULL;
_cleanup_free_ char *console_message = NULL;
- int current_numdevices = 0, l = 0;
+ _cleanup_free_ char *fsck_message = NULL;
+ int current_numdevices = 0, l = 0, r;
double current_percent = 100;
/* get the overall percentage */
m->numdevices = current_numdevices;
m->percent = current_percent;
- if (asprintf(&console_message, "Checking in progress on %d disks (%3.1f%% complete)",
- m->numdevices, m->percent) < 0)
+ if (asprintf(&console_message,
+ ngettext("Checking in progress on %d disk (%3.1f%% complete)",
+ "Checking in progress on %d disks (%3.1f%% complete)", m->numdevices),
+ m->numdevices, m->percent) < 0)
+ return -ENOMEM;
+ if (asprintf(&fsck_message, "fsckd:%d:%3.1f:%s", m->numdevices, m->percent, console_message) < 0)
return -ENOMEM;
/* write to console */
fflush(m->console);
}
+ /* try to connect to plymouth and send message */
+ r = send_message_plymouth(m, fsck_message);
+ if (r < 0)
+ log_debug("Couldn't send message to plymouth");
+
if (l > m->clear)
m->clear = l;
}
return 0;
}
+static int connect_plymouth(Manager *m) {
+ union sockaddr_union sa = PLYMOUTH_SOCKET;
+ int r;
+
+ /* try to connect or reconnect if sending a message */
+ if (m->plymouth_fd <= 0) {
+ m->plymouth_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
+ if (m->plymouth_fd < 0) {
+ return log_warning_errno(errno, "Connection to plymouth socket failed: %m");
+ }
+ if (connect(m->plymouth_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) {
+ on_plymouth_disconnect(m);
+ return log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+ }
+ r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
+ if (r < 0) {
+ on_plymouth_disconnect(m);
+ return log_warning_errno(r, "Can't listen to plymouth socket: %m");
+ }
+ }
+
+ return 0;
+}
+
static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
Client *client = userdata;
Manager *m = NULL;
assert(client);
m = client->manager;
+ /* check first if we need to cancel this client */
+ if (m->cancel_requested) {
+ if (!client->cancelled)
+ request_cancel_client(client);
+ }
+
/* ensure we have enough data to read */
r = ioctl(fd, FIONREAD, &buflen);
if (r == 0 && buflen != 0 && (size_t) buflen < sizeof(FsckProgress)) {
remove_client(&(m->clients), client);
return r;
}
+ /* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */
+ if (m->cancel_requested)
+ request_cancel_client(client);
} else
return log_error_errno(errno, "Couldn't accept a new connection: %m");
}
safe_close(m->connection_fd);
+ safe_close(m->plymouth_fd);
if (m->console)
fclose(m->console);
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;
+ m->plymouth_fd = -1;
*ret = m;
m = NULL;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
+ init_gettext();
r = parse_argv(argc, argv);
if (r <= 0)
~ianmdlvl / elogind.git / blobdiff