#include "bus-errors.h"
#include "fileio.h"
#include "udev-util.h"
+#include "path-util.h"
static bool arg_skip = false;
static bool arg_force = false;
log_error("Failed to start unit: %s", bus_error_message(&error, -r));
}
-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"))
+static int parse_proc_cmdline_item(const char *key, const char *value) {
+
+ if (streq(key, "fsck.mode") && value) {
+
+ if (streq(value, "auto"))
+ arg_force = arg_skip = false;
+ else if (streq(value, "force"))
+ arg_force = true;
+ else if (streq(value, "skip"))
+ arg_skip = true;
+ 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 (streq(w, "fastboot")) {
- log_error("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
+ 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(w, "forcefsck")) {
- log_error("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
+ } 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
f = fdopen(fd, "r");
if (!f) {
- close_nointr_nofail(fd);
+ safe_close(fd);
return -errno;
}
umask(0022);
- parse_proc_cmdline(parse_proc_cmdline_word);
+ parse_proc_cmdline(parse_proc_cmdline_item);
test_files();
if (!arg_force && arg_skip)
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);
+ r = fsck_exists(type);
if (r < 0) {
- if (errno == ENOENT) {
- log_info("%s doesn't exist, not checking file system.", checker);
+ if (r == -ENOENT) {
+ log_info("fsck.%s doesn't exist, not checking file system.", type);
return EXIT_SUCCESS;
} else
- log_warning("%s cannot be used: %m", checker);
+ log_warning("fsck.%s cannot be used: %s", type, strerror(-r));
}
}
} else if (pid == 0) {
/* Child */
if (progress_pipe[0] >= 0)
- close_nointr_nofail(progress_pipe[0]);
+ safe_close(progress_pipe[0]);
execv(cmdline[0], (char**) cmdline);
_exit(8); /* Operational error */
}
- if (progress_pipe[1] >= 0) {
- close_nointr_nofail(progress_pipe[1]);
- progress_pipe[1] = -1;
- }
+ progress_pipe[1] = safe_close(progress_pipe[1]);
if (progress_pipe[0] >= 0) {
process_progress(progress_pipe[0]);
touch("/run/systemd/quotacheck");
finish:
- close_pipe(progress_pipe);
+ safe_close_pair(progress_pipe);
return r;
}