chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop_duplicates: copy full BindMount struct
[elogind.git]
/
src
/
quotacheck
/
quotacheck.c
diff --git
a/src/quotacheck/quotacheck.c
b/src/quotacheck/quotacheck.c
index 1f637850415ab8ca849dc16a83bf1687b2e9a68b..ed95b48c63e6881cb1cccee32edc882a655b48e4 100644
(file)
--- a/
src/quotacheck/quotacheck.c
+++ b/
src/quotacheck/quotacheck.c
@@
-26,48
+26,37
@@
#include <unistd.h>
#include "util.h"
#include <unistd.h>
#include "util.h"
-#include "virt.h"
#include "fileio.h"
static bool arg_skip = false;
static bool arg_force = false;
#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;
arg_force = arg_skip = false;
- else if (str
neq(w, "quotacheck.mode=force", l
))
+ else if (str
eq(value, "force"
))
arg_force = true;
arg_force = true;
- else if (str
neq(w, "quotacheck.mode=skip", l
))
+ else if (str
eq(value, "skip"
))
arg_skip = true;
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
#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;
}
static void test_files(void) {
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.");
#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.");
@@
-97,7
+86,7
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- parse_proc_cmdline();
+ parse_proc_cmdline(
parse_proc_cmdline_item
);
test_files();
if (!arg_force) {
test_files();
if (!arg_force) {