summaryrefslogtreecommitdiff
path: root/src/fsck/fsck.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-06 17:05:55 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-06 18:48:22 +0100
commit059cb3858acd038ff2cef10a3a99119bf71a8fc6 (patch)
tree065a3a0c911856a6a02ab8f128890970b75bcb95 /src/fsck/fsck.c
parent27d14fb331ba8144f99f4da2d13f15cf5c8b8a9f (diff)
util: move more intellegince into parse_proc_cmdline()
Already split variable assignments before invoking the callback. And drop "rd." settings if we are not in an initrd.
Diffstat (limited to 'src/fsck/fsck.c')
-rw-r--r--src/fsck/fsck.c31
1 files changed, 18 insertions, 13 deletions
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 4a5f6b17c1..b6691c96ff 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -72,21 +72,26 @@ static void start_target(const char *target) {
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
@@ -215,7 +220,7 @@ int main(int argc, char *argv[]) {
umask(0022);
- parse_proc_cmdline(parse_proc_cmdline_word);
+ parse_proc_cmdline(parse_proc_cmdline_item);
test_files();
if (!arg_force && arg_skip)