X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fquotacheck.c;h=da2da3b2e05adca5ddcc79ec6452ab0d0e444e51;hp=a579c5e8b713727cd9c7476dff17dd6b2c1aac0c;hb=0a27cf3f32403f48059396cb43ad25d0a12ef64b;hpb=3d20ed6d51e38968cd646e2b3b24f36673408024;ds=sidebyside diff --git a/src/quotacheck.c b/src/quotacheck.c index a579c5e8b..da2da3b2e 100644 --- a/src/quotacheck.c +++ b/src/quotacheck.c @@ -50,7 +50,7 @@ static int parse_proc_cmdline(void) { arg_skip = true; else if (startswith(w, "quotacheck.mode")) log_warning("Invalid quotacheck.mode= parameter. Ignoring."); -#ifdef TARGET_FEDORA +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) else if (strneq(w, "forcequotacheck", l)) arg_force = true; #endif @@ -61,9 +61,9 @@ static int parse_proc_cmdline(void) { } static void test_files(void) { -#ifdef TARGET_FEDORA - /* This exists only on Fedora */ - if (access("/forcequoatcheck", F_OK) >= 0) +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) + /* This exists only on Fedora or Mandriva */ + if (access("/forcequotacheck", F_OK) >= 0) arg_force = true; #endif } @@ -91,11 +91,10 @@ int main(int argc, char *argv[]) { test_files(); if (!arg_force) { - if (arg_skip) return 0; - if (access("/dev/.systemd/quotacheck", F_OK) < 0) + if (access("/dev/.run/systemd/quotacheck", F_OK) < 0) return 0; } @@ -108,7 +107,7 @@ int main(int argc, char *argv[]) { _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) == 0 ? EXIT_SUCCESS : EXIT_FAILURE; finish: return r;