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;
-
- FOREACH_WORD_QUOTED(w, l, line, state) {
-
- if (strneq(w, "fsck.mode=auto", l))
- arg_force = arg_skip = false;
- else if (strneq(w, "fsck.mode=force", l))
- arg_force = true;
- else if (strneq(w, "fsck.mode=skip", l))
- arg_skip = true;
- else if (startswith(w, "fsck"))
- log_warning("Invalid fsck parameter. Ignoring.");
+static int parse_proc_cmdline_word(const char *w) {
+ if (streq(w, "fsck.mode=auto"))
+ arg_force = arg_skip = false;
+ else if (streq(w, "fsck.mode=force"))
+ arg_force = true;
+ else if (streq(w, "fsck.mode=skip"))
+ arg_skip = true;
+ else if (startswith(w, "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(w, "fastboot")) {
+ log_error("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
+ arg_skip = true;
+ } else if (streq(w, "forcefsck")) {
+ log_error("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
+ arg_force = true;
}
+#endif
- free(line);
return 0;
}
return -errno;
}
- console = fopen("/dev/console", "w");
+ console = fopen("/dev/console", "we");
if (!console)
return -ENOMEM;
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_word);
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 */
return EXIT_SUCCESS;
}
- udev = udev_new();
- if (!udev) {
- log_oom();
- return EXIT_FAILURE;
- }
-
udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev);
if (!udev_device) {
log_error("Failed to detect root device.");
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");