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=e4420eeb1bdf46105c76140f0fe07e73009e398c;hpb=dce818b390a857a11f7dd634684500675cf79833;p=elogind.git

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index e4420eeb1..efd6e1830 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -26,60 +26,53 @@
 #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;
+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) {
 
-        if ((r = read_one_line_file("/proc/cmdline", &line)) < 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.mode"))
+                else
                         log_warning("Invalid quotacheck.mode= parameter. Ignoring.");
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-                else if (strneq(w, "forcequotacheck", l))
-                        arg_force = true;
-#endif
+
+        } else if (startswith(key, "quotacheck."))
+                log_warning("Invalid quotacheck parameter. Ignoring.");
+#ifdef HAVE_SYSV_COMPAT
+        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) {
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-        /* This exists only on Fedora, Mandriva or Mageia */
-        if (access("/forcequotacheck", F_OK) >= 0)
+#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.");
                 arg_force = true;
+        }
 #endif
 }
 
 int main(int argc, char *argv[]) {
+
         static const char * const cmdline[] = {
-                "/sbin/quotacheck",
+                QUOTACHECK,
                 "-anug",
                 NULL
         };
 
-        int r = EXIT_FAILURE;
         pid_t pid;
 
         if (argc > 1) {
@@ -93,28 +86,26 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        parse_proc_cmdline();
+        parse_proc_cmdline(parse_proc_cmdline_item);
         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) {
+        pid = fork();
+        if (pid < 0) {
                 log_error("fork(): %m");
-                goto finish;
+                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;
-
-finish:
-        return r;
+        return wait_for_terminate_and_warn("quotacheck", pid) >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }