chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmdline: we actually want to parse the kernel cmdline in VMs, just not in containers
[elogind.git]
/
src
/
load-fragment.c
diff --git
a/src/load-fragment.c
b/src/load-fragment.c
index eea545c8d983a02e7a41bfaa1380d1513c0fd6e9..8635bdb226b6eee2397ee290120fa122e1db703e 100644
(file)
--- a/
src/load-fragment.c
+++ b/
src/load-fragment.c
@@
-30,6
+30,8
@@
#include <sys/mount.h>
#include <linux/fs.h>
#include <sys/stat.h>
#include <sys/mount.h>
#include <linux/fs.h>
#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include "unit.h"
#include "strv.h"
#include "unit.h"
#include "strv.h"
@@
-965,7
+967,9
@@
static int config_parse_limit(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- if (safe_atollu(rvalue, &u) < 0) {
+ if (streq(rvalue, "infinity"))
+ u = (unsigned long long) RLIM_INFINITY;
+ else if (safe_atollu(rvalue, &u) < 0) {
log_error("[%s:%u] Failed to parse resource value, ignoring: %s", filename, line, rvalue);
return 0;
}
log_error("[%s:%u] Failed to parse resource value, ignoring: %s", filename, line, rvalue);
return 0;
}