summaryrefslogtreecommitdiff
path: root/src/quotacheck
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/quotacheck
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/quotacheck')
-rw-r--r--src/quotacheck/quotacheck.c28
1 files changed, 17 insertions, 11 deletions
diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 8ff0f7f0c3..efd6e18308 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -31,18 +31,24 @@
static bool arg_skip = false;
static bool arg_force = false;
-static int parse_proc_cmdline_word(const char *w) {
- if (streq(w, "quotacheck.mode=auto"))
- arg_force = arg_skip = false;
- else if (streq(w, "quotacheck.mode=force"))
- arg_force = true;
- else if (streq(w, "quotacheck.mode=skip"))
- arg_skip = true;
- else if (startswith(w, "quotacheck"))
+static int parse_proc_cmdline_item(const char *key, const char *value) {
+
+ if (streq(key, "quotacheck.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 quotacheck.mode= parameter. Ignoring.");
+
+ } else if (startswith(key, "quotacheck."))
log_warning("Invalid quotacheck parameter. Ignoring.");
#ifdef HAVE_SYSV_COMPAT
- else if (streq(w, "forcequotacheck")) {
- log_error("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line.");
+ else if (streq(key, "forcequotacheck") && !value) {
+ log_warning("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line.");
arg_force = true;
}
#endif
@@ -80,7 +86,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) {