X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fquotacheck%2Fquotacheck.c;h=efd6e18308ae5d201d8d850d06679e668285b2d7;hb=6d313367d9ef780560e117e886502a99fa220eac;hp=1f637850415ab8ca849dc16a83bf1687b2e9a68b;hpb=83374163014eb50ed0ecd4f18ab45e5280ce7081;p=elogind.git

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 1f6378504..efd6e1830 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -26,44 +26,33 @@
 #include <unistd.h>
 
 #include "util.h"
-#include "virt.h"
 #include "fileio.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;
 
-static int parse_proc_cmdline(void) {
-        _cleanup_free_ char *line = NULL;
-        char *w, *state;
-        size_t l;
-        int r;
+static int parse_proc_cmdline_item(const char *key, const char *value) {
 
-        if (detect_container(NULL) > 0)
-                return 0;
+        if (streq(key, "quotacheck.mode") && value) {
 
-        r = read_one_line_file("/proc/cmdline", &line);
-        if (r < 0) {
-                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
-                return 0;
-        }
-
-        FOREACH_WORD_QUOTED(w, l, line, state) {
-
-                if (strneq(w, "quotacheck.mode=auto", l))
+                if (streq(value, "auto"))
                         arg_force = arg_skip = false;
-                else if (strneq(w, "quotacheck.mode=force", l))
+                else if (streq(value, "force"))
                         arg_force = true;
-                else if (strneq(w, "quotacheck.mode=skip", l))
+                else if (streq(value, "skip"))
                         arg_skip = true;
-                else if (startswith(w, "quotacheck"))
-                        log_warning("Invalid quotacheck parameter. Ignoring.");
+                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 (strneq(w, "forcequotacheck", l)) {
-                        log_error("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line.");
-                        arg_force = true;
-                }
-#endif
+        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
+
         return 0;
 }
 
@@ -97,7 +86,7 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        parse_proc_cmdline();
+        parse_proc_cmdline(parse_proc_cmdline_item);
         test_files();
 
         if (!arg_force) {