chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: do not read system boot timestamps in systemd --user mode
[elogind.git]
/
src
/
core
/
load-fragment.c
diff --git
a/src/core/load-fragment.c
b/src/core/load-fragment.c
index 06e3031d65cd51ed50e392c45ee3dac7e2aae74e..c604f9096d0e4d33e48830e90134db6c95802ac9 100644
(file)
--- a/
src/core/load-fragment.c
+++ b/
src/core/load-fragment.c
@@
-64,7
+64,7
@@
#include "seccomp-util.h"
#endif
#include "seccomp-util.h"
#endif
-#if !defined(HAVE_SYSV_COMPAT) || !defined(HAVE_SECCOMP) || !defined(HAVE_
LIBWRAP) || !defined(HAVE_
PAM) || !defined(HAVE_SELINUX) || !defined(HAVE_SMACK) || !defined(HAVE_APPARMOR)
+#if !defined(HAVE_SYSV_COMPAT) || !defined(HAVE_SECCOMP) || !defined(HAVE_PAM) || !defined(HAVE_SELINUX) || !defined(HAVE_SMACK) || !defined(HAVE_APPARMOR)
int config_parse_warn_compat(
const char *unit,
const char *filename,
int config_parse_warn_compat(
const char *unit,
const char *filename,
@@
-1125,15
+1125,13
@@
int config_parse_exec_mount_flags(const char *unit,
return log_oom();
if (streq(t, "shared"))
return log_oom();
if (streq(t, "shared"))
- flags
|
= MS_SHARED;
+ flags = MS_SHARED;
else if (streq(t, "slave"))
else if (streq(t, "slave"))
- flags
|
= MS_SLAVE;
+ flags = MS_SLAVE;
else if (streq(w, "private"))
else if (streq(w, "private"))
- flags
|
= MS_PRIVATE;
+ flags = MS_PRIVATE;
else {
else {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Failed to parse mount flag %s, ignoring: %s",
- t, rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Failed to parse mount flag %s, ignoring: %s", t, rvalue);
return 0;
}
}
return 0;
}
}
@@
-1256,7
+1254,6
@@
int config_parse_timer(const char *unit,
TimerValue *v;
TimerBase b;
CalendarSpec *c = NULL;
TimerValue *v;
TimerBase b;
CalendarSpec *c = NULL;
- clockid_t id;
assert(filename);
assert(lvalue);
assert(filename);
assert(lvalue);
@@
-1283,8
+1280,6
@@
int config_parse_timer(const char *unit,
rvalue);
return 0;
}
rvalue);
return 0;
}
-
- id = CLOCK_REALTIME;
} else {
if (parse_sec(rvalue, &u) < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
} else {
if (parse_sec(rvalue, &u) < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
@@
-1292,8
+1287,6
@@
int config_parse_timer(const char *unit,
rvalue);
return 0;
}
rvalue);
return 0;
}
-
- id = CLOCK_MONOTONIC;
}
v = new0(TimerValue, 1);
}
v = new0(TimerValue, 1);
@@
-1301,7
+1294,6
@@
int config_parse_timer(const char *unit,
return log_oom();
v->base = b;
return log_oom();
v->base = b;
- v->clock_id = id;
v->value = u;
v->calendar_spec = c;
v->value = u;
v->calendar_spec = c;
@@
-3085,7
+3077,7
@@
static int open_follow(char **filename, FILE **_f, Set *names, char **_final) {
f = fdopen(fd, "re");
if (!f) {
r = -errno;
f = fdopen(fd, "re");
if (!f) {
r = -errno;
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
return r;
}
return r;
}
@@
-3336,7
+3328,7
@@
void unit_dump_config_items(FILE *f) {
const ConfigParserCallback callback;
const char *rvalue;
} table[] = {
const ConfigParserCallback callback;
const char *rvalue;
} table[] = {
-#if !defined(HAVE_SYSV_COMPAT) || !defined(HAVE_SECCOMP) || !defined(HAVE_
LIBWRAP) || !defined(HAVE_
PAM) || !defined(HAVE_SELINUX) || !defined(HAVE_SMACK) || !defined(HAVE_APPARMOR)
+#if !defined(HAVE_SYSV_COMPAT) || !defined(HAVE_SECCOMP) || !defined(HAVE_PAM) || !defined(HAVE_SELINUX) || !defined(HAVE_SMACK) || !defined(HAVE_APPARMOR)
{ config_parse_warn_compat, "NOTSUPPORTED" },
#endif
{ config_parse_int, "INTEGER" },
{ config_parse_warn_compat, "NOTSUPPORTED" },
#endif
{ config_parse_int, "INTEGER" },