#include <getopt.h>
#include <errno.h>
+#include <libintl.h>
#include <math.h>
#include <stdbool.h>
#include <stdlib.h>
#include <sys/un.h>
#include <unistd.h>
+#include "sd-daemon.h"
#include "build.h"
+#include "def.h"
#include "event-util.h"
-#include "fsckd.h"
#include "log.h"
#include "list.h"
#include "macro.h"
-#include "sd-daemon.h"
#include "socket-util.h"
#include "util.h"
+#include "fsckd.h"
#define IDLE_TIME_SECONDS 30
+#define PLYMOUTH_REQUEST_KEY "K\2\2\3"
struct Manager;
struct Manager *manager;
int fd;
dev_t devnum;
+
size_t cur;
size_t max;
int pass;
+
double percent;
+
size_t buflen;
+ bool cancelled;
LIST_FIELDS(struct Client, clients);
} Client;
typedef struct Manager {
sd_event *event;
- Client *clients;
+
+ LIST_HEAD(Client, clients);
+
int clear;
int connection_fd;
+
FILE *console;
double percent;
int numdevices;
+
+ int plymouth_fd;
+ sd_event_source *plymouth_event_source;
+ 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 = {
+ .cancel = 1,
+ };
+
+ ssize_t n;
+
+ n = send(current->fd, &cancel_msg, sizeof(FsckdMessage), 0);
+ if (n < 0)
+ return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(current->devnum), minor(current->devnum));
+ if ((size_t) n < sizeof(FsckdMessage)) {
+ log_warning("Short send when sending cancel to fsck on (%u:%u).", major(current->devnum), minor(current->devnum));
+ return -EIO;
+ }
+
+ current->cancelled = true;
+ return 0;
+}
+
+static void client_free(Client *c) {
+ assert(c);
+
+ if (c->manager)
+ LIST_REMOVE(clients, c->manager->clients, c);
+
+ safe_close(c->fd);
+ free(c);
+}
+
+static void plymouth_disconnect(Manager *m) {
+ assert(m);
+
+ m->plymouth_event_source = sd_event_source_unref(m->plymouth_event_source);
+ m->plymouth_fd = safe_close(m->plymouth_fd);
+ 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];
+ ssize_t l;
+
+ assert(m);
+
+ l = read(m->plymouth_fd, buffer, sizeof(buffer));
+ if (l < 0) {
+ log_warning_errno(errno, "Got error while reading from plymouth: %m");
+ plymouth_disconnect(m);
+ return -errno;
+ }
+ if (l == 0) {
+ plymouth_disconnect(m);
+ return 0;
+ }
+
+ 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 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();
+
+ return loop_write(plymouth_fd, packet, n + 1, true);
+}
+
+static int send_message_plymouth(Manager *m, const char *message) {
+ 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 */
+ r = loop_write(m->plymouth_fd, PLYMOUTH_REQUEST_KEY, sizeof(PLYMOUTH_REQUEST_KEY), true);
+ if (r < 0)
+ return log_warning_errno(r, "Can't send to plymouth cancel key: %m");
+
+ m->plymouth_cancel_sent = true;
-static void remove_client(Client **first, Client *item) {
- LIST_REMOVE(clients, *first, item);
- safe_close(item->fd);
- free(item);
+ 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(r, "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)
+ return 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) {
+ r = log_warning_errno(errno, "Couldn't connect to plymouth: %m");
+ goto fail;
+ }
+
+ r = sd_event_add_io(m->event, &m->plymouth_event_source, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m);
+ if (r < 0) {
+ log_warning_errno(r, "Can't listen to plymouth socket: %m");
+ goto fail;
+ }
+
+ return 0;
+
+fail:
+ plymouth_disconnect(m);
+ return r;
+}
+
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)) {
/* we got twice the same size from a bad behaving client, kick it off the list */
else {
log_warning("Closing bad behaving fsck client connection at fd %d", client->fd);
- remove_client(&(m->clients), client);
+ client_free(client);
r = update_global_progress(m);
if (r < 0)
log_warning_errno(r, "Couldn't update global progress: %m");
r = recv(fd, &fsck_data, sizeof(FsckProgress), 0);
if (r == 0) {
log_debug("Fsck client connected to fd %d disconnected", client->fd);
- remove_client(&(m->clients), client);
+ client_free(client);
} else if (r > 0 && r != sizeof(FsckProgress))
log_warning("Unexpected data structure sent to fsckd socket from fd: %d. Ignoring", client->fd);
else if (r > 0 && r == sizeof(FsckProgress)) {
/* Initialize and list new clients */
new_client_fd = accept4(m->connection_fd, NULL, NULL, SOCK_CLOEXEC);
- if (new_client_fd > 0) {
- log_debug("New fsck client connected to fd: %d", new_client_fd);
- client = new0(Client, 1);
- if (!client)
- return log_oom();
- client->fd = new_client_fd;
- client->manager = m;
- LIST_PREPEND(clients, m->clients, client);
- r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client);
- if (r < 0) {
- remove_client(&(m->clients), client);
- return r;
- }
- } else
+ if (new_client_fd < 0)
return log_error_errno(errno, "Couldn't accept a new connection: %m");
+ log_debug("New fsck client connected to fd: %d", new_client_fd);
+
+ client = new0(Client, 1);
+ if (!client)
+ return log_oom();
+ client->fd = new_client_fd;
+ client->manager = m;
+ LIST_PREPEND(clients, m->clients, client);
+ r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client);
+ if (r < 0) {
+ client_free(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);
+
return 0;
}
static void manager_free(Manager *m) {
- Client *current = NULL, *l = NULL;
if (!m)
return;
fflush(m->console);
}
+ plymouth_disconnect(m);
+
safe_close(m->connection_fd);
+
if (m->console)
fclose(m->console);
- LIST_FOREACH_SAFE(clients, current, l, m->clients)
- remove_client(&(m->clients), current);
+ while (m->clients)
+ client_free(m->clients);
sd_event_unref(m->event);
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)
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ goto finish;
n = sd_listen_fds(0);
if (n > 1) {
log_error("Too many file descriptors received.");
- return EXIT_FAILURE;
- } else if (n == 1) {
+ r = -EINVAL;
+ goto finish;
+ } else if (n == 1)
fd = SD_LISTEN_FDS_START + 0;
- } else {
+ else {
fd = make_socket_fd(LOG_DEBUG, FSCKD_SOCKET_PATH, SOCK_STREAM | SOCK_CLOEXEC);
if (fd < 0) {
- log_error_errno(r, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
- return EXIT_FAILURE;
+ r = log_error_errno(fd, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
+ goto finish;
}
}
r = manager_new(&m, fd);
if (r < 0) {
log_error_errno(r, "Failed to allocate manager: %m");
- return EXIT_FAILURE;
+ goto finish;
}
r = sd_event_add_io(m->event, NULL, fd, EPOLLIN, new_connection_handler, m);
if (r < 0) {
log_error_errno(r, "Can't listen to connection socket: %m");
- return EXIT_FAILURE;
+ goto finish;
}
r = run_event_loop_with_timeout(m->event, IDLE_TIME_SECONDS * USEC_PER_SEC);
if (r < 0) {
log_error_errno(r, "Failed to run event loop: %m");
- return EXIT_FAILURE;
+ goto finish;
}
sd_event_get_exit_code(m->event, &r);
+finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
~ianmdlvl / elogind.git / blobdiff