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;
}
return -errno;
}
- console = fopen("/dev/console", "w");
+ console = fopen("/dev/console", "we");
if (!console)
return -ENOMEM;
umask(0022);
- parse_proc_cmdline();
+ parse_proc_cmdline(parse_proc_cmdline_item);
test_files();
if (!arg_force && arg_skip)