X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fquotacheck%2Fquotacheck.c;h=9ae3abd99075e4312a87b847ef2e3150ce39bc50;hb=5fae368bda9419d9d378ea32077c8fd183dd4b81;hp=e7a44050277ffeb1c4e4c7d6c4519843de9344d1;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index e7a440502..9ae3abd99 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -26,47 +26,37 @@
 #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) {
-        char *line, *w, *state;
-        int r;
-        size_t l;
-
-        if (detect_container(NULL) > 0)
-                return 0;
-
-        if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
-                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
-                return 0;
-        }
+static int parse_proc_cmdline_item(const char *key, const char *value) {
 
-        FOREACH_WORD_QUOTED(w, l, line, state) {
+        if (streq(key, "quotacheck.mode") && value) {
 
-                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 '%s'. Ignoring.", value);
+        }
+
 #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
 
-        free(line);
         return 0;
 }
 
 static void test_files(void) {
+
 #ifdef HAVE_SYSV_COMPAT
         if (access("/forcequotacheck", F_OK) >= 0) {
                 log_error("Please pass 'quotacheck.mode=force' on the kernel command line rather than creating /forcequotacheck on the root file system.");
@@ -76,14 +66,15 @@ static void test_files(void) {
 }
 
 int main(int argc, char *argv[]) {
+
         static const char * const cmdline[] = {
-                "/sbin/quotacheck",
+                QUOTACHECK,
                 "-anug",
                 NULL
         };
 
-        int r = EXIT_FAILURE;
         pid_t pid;
+        int r;
 
         if (argc > 1) {
                 log_error("This program takes no arguments.");
@@ -96,28 +87,31 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        parse_proc_cmdline();
+        r = parse_proc_cmdline(parse_proc_cmdline_item);
+        if (r < 0)
+                log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
+
         test_files();
 
         if (!arg_force) {
                 if (arg_skip)
-                        return 0;
+                        return EXIT_SUCCESS;
 
                 if (access("/run/systemd/quotacheck", F_OK) < 0)
-                        return 0;
+                        return EXIT_SUCCESS;
         }
 
-        if ((pid = fork()) < 0) {
-                log_error("fork(): %m");
-                goto finish;
+        pid = fork();
+        if (pid < 0) {
+                log_error_errno(errno, "fork(): %m");
+                return EXIT_FAILURE;
         } else if (pid == 0) {
                 /* Child */
                 execv(cmdline[0], (char**) cmdline);
                 _exit(1); /* Operational error */
         }
 
-        r = wait_for_terminate_and_warn("quotacheck", pid) == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+        r = wait_for_terminate_and_warn("quotacheck", pid, true);
 
-finish:
-        return r;
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }