#include <unistd.h>
#include <fcntl.h>
#include <sys/file.h>
+#include <sys/stat.h>
#include "sd-bus.h"
#include "libudev.h"
#include "special.h"
#include "bus-util.h"
#include "bus-error.h"
-#include "bus-errors.h"
+#include "bus-common-errors.h"
#include "fileio.h"
#include "udev-util.h"
#include "path-util.h"
+#include "socket-util.h"
+#include "fsckd/fsckd.h"
static bool arg_skip = false;
static bool arg_force = false;
-static bool arg_show_progress = false;
static const char *arg_repair = "-a";
static void start_target(const char *target) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_close_unref_ sd_bus *bus = NULL;
int r;
assert(target);
r = bus_open_system_systemd(&bus);
if (r < 0) {
- log_error("Failed to get D-Bus connection: %s", strerror(-r));
+ log_error_errno(r, "Failed to get D-Bus connection: %m");
return;
}
}
#endif
- if (access("/run/systemd/show-status", F_OK) >= 0 || plymouth_running())
- arg_show_progress = true;
}
-static double percent(int pass, unsigned long cur, unsigned long max) {
- /* Values stolen from e2fsck */
-
- static const int pass_table[] = {
- 0, 70, 90, 92, 95, 100
+static int process_progress(int fd, dev_t device_num) {
+ _cleanup_fclose_ FILE *f = NULL;
+ usec_t last = 0;
+ _cleanup_close_ int fsckd_fd = -1;
+ static const union sockaddr_union sa = {
+ .un.sun_family = AF_UNIX,
+ .un.sun_path = FSCKD_SOCKET_PATH,
};
- if (pass <= 0)
- return 0.0;
-
- if ((unsigned) pass >= ELEMENTSOF(pass_table) || max == 0)
- return 100.0;
-
- return (double) pass_table[pass-1] +
- ((double) pass_table[pass] - (double) pass_table[pass-1]) *
- (double) cur / (double) max;
-}
-
-static int process_progress(int fd) {
- _cleanup_fclose_ FILE *console = NULL, *f = NULL;
- usec_t last = 0;
- bool locked = false;
- int clear = 0;
+ fsckd_fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+ if (fsckd_fd < 0)
+ return log_warning_errno(errno, "Cannot open fsckd socket, we won't report fsck progress: %m");
+ if (connect(fsckd_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0)
+ return log_warning_errno(errno, "Cannot connect to fsckd socket, we won't report fsck progress: %m");
f = fdopen(fd, "r");
- if (!f) {
- safe_close(fd);
- return -errno;
- }
-
- console = fopen("/dev/console", "we");
- if (!console)
- return -ENOMEM;
+ if (!f)
+ return log_warning_errno(errno, "Cannot connect to fsck, we won't report fsck progress: %m");
while (!feof(f)) {
- int pass, m;
- unsigned long cur, max;
- _cleanup_free_ char *device = NULL;
- double p;
+ int pass;
+ size_t cur, max;
+ ssize_t n;
usec_t t;
+ _cleanup_free_ char *device = NULL;
+ FsckProgress progress;
if (fscanf(f, "%i %lu %lu %ms", &pass, &cur, &max, &device) != 4)
break;
- /* Only show one progress counter at max */
- if (!locked) {
- if (flock(fileno(console), LOCK_EX|LOCK_NB) < 0)
- continue;
-
- locked = true;
- }
-
/* Only update once every 50ms */
t = now(CLOCK_MONOTONIC);
if (last + 50 * USEC_PER_MSEC > t)
last = t;
- p = percent(pass, cur, max);
- fprintf(console, "\r%s: fsck %3.1f%% complete...\r%n", device, p, &m);
- fflush(console);
-
- if (m > clear)
- clear = m;
- }
-
- if (clear > 0) {
- unsigned j;
+ /* send progress to fsckd */
+ progress.devnum = device_num;
+ progress.cur = cur;
+ progress.max = max;
+ progress.pass = pass;
- fputc('\r', console);
- for (j = 0; j < (unsigned) clear; j++)
- fputc(' ', console);
- fputc('\r', console);
- fflush(console);
+ n = send(fsckd_fd, &progress, sizeof(FsckProgress), 0);
+ if (n < 0 || (size_t) n < sizeof(FsckProgress))
+ log_warning_errno(errno, "Cannot communicate fsck progress to fsckd: %m");
}
return 0;
const char *device, *type;
bool root_directory;
int progress_pipe[2] = { -1, -1 };
- char dash_c[2+10+1];
+ char dash_c[sizeof("-C")-1 + DECIMAL_STR_MAX(int) + 1];
struct stat st;
if (argc > 2) {
umask(0022);
- parse_proc_cmdline(parse_proc_cmdline_item);
+ q = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (q < 0)
+ log_warning_errno(q, "Failed to parse kernel command line, ignoring: %m");
+
test_files();
if (!arg_force && arg_skip)
root_directory = false;
if (stat(device, &st) < 0) {
- log_error("Failed to stat '%s': %m", device);
+ log_error_errno(errno, "Failed to stat '%s': %m", device);
return EXIT_FAILURE;
}
/* Find root device */
if (stat("/", &st) < 0) {
- log_error("Failed to stat() the root directory: %m");
+ log_error_errno(errno, "Failed to stat() the root directory: %m");
return EXIT_FAILURE;
}
type = udev_device_get_property_value(udev_device, "ID_FS_TYPE");
if (type) {
r = fsck_exists(type);
- if (r < 0) {
- if (r == -ENOENT) {
- log_info("fsck.%s doesn't exist, not checking file system on %s",
- type, device);
- return EXIT_SUCCESS;
- } else
- log_warning("fsck.%s cannot be used for %s: %s",
- type, device, strerror(-r));
- }
+ if (r == -ENOENT) {
+ log_info("fsck.%s doesn't exist, not checking file system on %s", type, device);
+ return EXIT_SUCCESS;
+ } else if (r < 0)
+ log_warning_errno(r, "fsck.%s cannot be used for %s: %m", type, device);
}
- if (arg_show_progress)
- if (pipe(progress_pipe) < 0) {
- log_error("pipe(): %m");
- return EXIT_FAILURE;
- }
+ if (pipe(progress_pipe) < 0) {
+ log_error_errno(errno, "pipe(): %m");
+ return EXIT_FAILURE;
+ }
cmdline[i++] = "/sbin/fsck";
cmdline[i++] = arg_repair;
cmdline[i++] = "-T";
/*
- * Disable locking which conflict with udev's event
- * ownershipi, until util-linux moves the flock
- * synchronization file which prevents multiple fsck running
- * on the same rotationg media, from the disk device
- * node to a privately owned regular file.
- *
- * https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
- *
- * cmdline[i++] = "-l";
+ * Since util-linux v2.25 fsck uses /run/fsck/<diskname>.lock files.
+ * The previous versions use flock for the device and conflict with
+ * udevd, see https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
*/
+ cmdline[i++] = "-l";
if (!root_directory)
cmdline[i++] = "-M";
cmdline[i++] = "-f";
if (progress_pipe[1] >= 0) {
- snprintf(dash_c, sizeof(dash_c), "-C%i", progress_pipe[1]);
- char_array_0(dash_c);
+ xsprintf(dash_c, "-C%i", progress_pipe[1]);
cmdline[i++] = dash_c;
}
pid = fork();
if (pid < 0) {
- log_error("fork(): %m");
+ log_error_errno(errno, "fork(): %m");
goto finish;
} else if (pid == 0) {
/* Child */
progress_pipe[1] = safe_close(progress_pipe[1]);
if (progress_pipe[0] >= 0) {
- process_progress(progress_pipe[0]);
+ process_progress(progress_pipe[0], st.st_rdev);
progress_pipe[0] = -1;
}
q = wait_for_terminate(pid, &status);
if (q < 0) {
- log_error("waitid(): %s", strerror(-q));
+ log_error_errno(q, "waitid(): %m");
goto finish;
}