From 7d4a62f8c1404ed426500b97af03d4ef8d034a71 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Thu, 15 Nov 2012 10:33:16 -0500 Subject: Isolation of udev code from remaining systemd This commit is a first attempt to isolate the udev code from the remaining code base. It intentionally does not modify any files but purely delete files which, on a first examination, appear to not be needed. This is a sweeping commit which may easily have missed needed code. Files can be retrieved by doing a checkout from the previous commit: git checkout 2944f347d0 -- --- src/quotacheck/Makefile | 1 - src/quotacheck/quotacheck.c | 120 -------------------------------------------- 2 files changed, 121 deletions(-) delete mode 120000 src/quotacheck/Makefile delete mode 100644 src/quotacheck/quotacheck.c (limited to 'src/quotacheck') diff --git a/src/quotacheck/Makefile b/src/quotacheck/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/quotacheck/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile \ No newline at end of file diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c deleted file mode 100644 index 05e4971487..0000000000 --- a/src/quotacheck/quotacheck.c +++ /dev/null @@ -1,120 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2010 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include -#include -#include - -#include "util.h" -#include "virt.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; - } - - FOREACH_WORD_QUOTED(w, l, line, state) { - - if (strneq(w, "quotacheck.mode=auto", l)) - arg_force = arg_skip = false; - else if (strneq(w, "quotacheck.mode=force", l)) - arg_force = true; - else if (strneq(w, "quotacheck.mode=skip", l)) - arg_skip = true; - else if (startswith(w, "quotacheck")) - log_warning("Invalid quotacheck parameter. Ignoring."); -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) - else if (strneq(w, "forcequotacheck", l)) - 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) - arg_force = true; -#endif -} - -int main(int argc, char *argv[]) { - static const char * const cmdline[] = { - "/sbin/quotacheck", - "-anug", - NULL - }; - - int r = EXIT_FAILURE; - pid_t pid; - - if (argc > 1) { - log_error("This program takes no arguments."); - return EXIT_FAILURE; - } - - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); - - umask(0022); - - parse_proc_cmdline(); - test_files(); - - if (!arg_force) { - if (arg_skip) - return 0; - - if (access("/run/systemd/quotacheck", F_OK) < 0) - return 0; - } - - if ((pid = fork()) < 0) { - log_error("fork(): %m"); - goto finish; - } 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; -} -- cgit v1.2.3-54-g00ecf