log_error("Failed to start unit: %s", bus_error_message(&error, -r));
}
-static int parse_proc_cmdline(void) {
- char *line, *w, *state;
- size_t l;
- int r;
-
- r = proc_cmdline(&line);
- if (r < 0)
- log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- if (r <= 0)
- return 0;
+static int parse_proc_cmdline_item(const char *key, const char *value) {
- FOREACH_WORD_QUOTED(w, l, line, state) {
+ if (streq(key, "fsck.mode") && value) {
- if (strneq(w, "fsck.mode=auto", l))
+ if (streq(value, "auto"))
arg_force = arg_skip = false;
- else if (strneq(w, "fsck.mode=force", l))
+ else if (streq(value, "force"))
arg_force = true;
- else if (strneq(w, "fsck.mode=skip", l))
+ else if (streq(value, "skip"))
arg_skip = true;
- else if (startswith(w, "fsck"))
- log_warning("Invalid fsck parameter. Ignoring.");
+ else
+ log_warning("Invalid fsck.mode= parameter. Ignoring.");
+ } else if (startswith(key, "fsck."))
+ log_warning("Invalid fsck parameter. Ignoring.");
#ifdef HAVE_SYSV_COMPAT
- else if (strneq(w, "fastboot", l)) {
- log_error("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
- arg_skip = true;
- } else if (strneq(w, "forcefsck", l)) {
- log_error("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
- arg_force = true;
- }
-#endif
+ else if (streq(key, "fastboot") && !value) {
+ log_warning("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
+ arg_skip = true;
+ } else if (streq(key, "forcefsck") && !value) {
+ log_warning("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
+ arg_force = true;
}
+#endif
- free(line);
return 0;
}
}
static int process_progress(int fd) {
- FILE *f, *console;
+ _cleanup_fclose_ FILE *console = NULL, *f = NULL;
usec_t last = 0;
bool locked = false;
int clear = 0;
return -errno;
}
- console = fopen("/dev/console", "w");
- if (!console) {
- fclose(f);
+ console = fopen("/dev/console", "we");
+ if (!console)
return -ENOMEM;
- }
while (!feof(f)) {
int pass, m;
unsigned long cur, max;
- char *device;
+ _cleanup_free_ char *device = NULL;
double p;
usec_t t;
/* Only show one progress counter at max */
if (!locked) {
- if (flock(fileno(console), LOCK_EX|LOCK_NB) < 0) {
- free(device);
+ 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) {
- free(device);
+ if (last + 50 * USEC_PER_MSEC > t)
continue;
- }
last = t;
fprintf(console, "\r%s: fsck %3.1f%% complete...\r%n", device, p, &m);
fflush(console);
- free(device);
-
if (m > clear)
clear = m;
}
fflush(console);
}
- fclose(f);
- fclose(console);
return 0;
}
siginfo_t status;
_cleanup_udev_unref_ struct udev *udev = NULL;
_cleanup_udev_device_unref_ struct udev_device *udev_device = NULL;
- const char *device;
+ const char *device, *type;
bool root_directory;
int progress_pipe[2] = { -1, -1 };
char dash_c[2+10+1];
+ struct stat st;
if (argc > 2) {
log_error("This program expects one or no arguments.");
umask(0022);
- parse_proc_cmdline();
+ parse_proc_cmdline(parse_proc_cmdline_item);
test_files();
if (!arg_force && arg_skip)
return 0;
+ udev = udev_new();
+ if (!udev) {
+ log_oom();
+ return EXIT_FAILURE;
+ }
+
if (argc > 1) {
device = argv[1];
root_directory = false;
+
+ if (stat(device, &st) < 0) {
+ log_error("Failed to stat '%s': %m", device);
+ return EXIT_FAILURE;
+ }
+
+ udev_device = udev_device_new_from_devnum(udev, 'b', st.st_rdev);
+ if (!udev_device) {
+ log_error("Failed to detect device %s", device);
+ return EXIT_FAILURE;
+ }
} else {
- struct stat st;
struct timespec times[2];
/* Find root device */
if (stat("/", &st) < 0) {
log_error("Failed to stat() the root directory: %m");
- goto finish;
+ return EXIT_FAILURE;
}
/* Virtual root devices don't need an fsck */
if (major(st.st_dev) == 0)
- return 0;
+ return EXIT_SUCCESS;
/* check if we are already writable */
times[0] = st.st_atim;
times[1] = st.st_mtim;
if (utimensat(AT_FDCWD, "/", times, 0) == 0) {
log_info("Root directory is writable, skipping check.");
- return 0;
- }
-
- if (!(udev = udev_new())) {
- log_oom();
- goto finish;
+ return EXIT_SUCCESS;
}
- if (!(udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev))) {
+ udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev);
+ if (!udev_device) {
log_error("Failed to detect root device.");
- goto finish;
+ return EXIT_FAILURE;
}
- if (!(device = udev_device_get_devnode(udev_device))) {
+ device = udev_device_get_devnode(udev_device);
+ if (!device) {
log_error("Failed to detect device node of root directory.");
- goto finish;
+ return EXIT_FAILURE;
}
root_directory = true;
}
+ type = udev_device_get_property_value(udev_device, "ID_FS_TYPE");
+ if (type) {
+ const char *checker = strappenda("/sbin/fsck.", type);
+ r = access(checker, X_OK);
+ if (r < 0) {
+ if (errno == ENOENT) {
+ log_info("%s doesn't exist, not checking file system.", checker);
+ return EXIT_SUCCESS;
+ } else
+ log_warning("%s cannot be used: %m", checker);
+ }
+ }
+
if (arg_show_progress)
if (pipe(progress_pipe) < 0) {
log_error("pipe(): %m");
- goto finish;
+ return EXIT_FAILURE;
}
cmdline[i++] = "/sbin/fsck";
~ianmdlvl / elogind.git / blobdiff