chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: avoid logging to kmsg in the normal paths
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index 9b947c9530469b7cf6b816bb21ae860acd1dcd97..603c2dc31824dfbb68371b369ab4e66f3e460aec 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foomanagerhfoo
-#define foomanagerhfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-152,6
+151,8
@@
struct Manager {
dual_timestamp finish_timestamp;
char *generator_unit_path;
dual_timestamp finish_timestamp;
char *generator_unit_path;
+ char *generator_unit_path_early;
+ char *generator_unit_path_late;
/* Data specific to the device subsystem */
struct udev* udev;
/* Data specific to the device subsystem */
struct udev* udev;
@@
-220,9
+221,6
@@
struct Manager {
bool show_status;
bool confirm_spawn;
bool show_status;
bool confirm_spawn;
-#ifdef HAVE_SYSV_COMPAT
- bool sysv_console;
-#endif
ExecOutput default_std_output, default_std_error;
ExecOutput default_std_output, default_std_error;
@@
-279,7
+277,7
@@
void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid
int manager_open_serialization(Manager *m, FILE **_f);
int manager_open_serialization(Manager *m, FILE **_f);
-int manager_serialize(Manager *m, FILE *f, FDSet *fds);
+int manager_serialize(Manager *m, FILE *f, FDSet *fds
, bool serialize_jobs
);
int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
int manager_reload(Manager *m);
int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
int manager_reload(Manager *m);
@@
-305,5
+303,3
@@
bool manager_get_show_status(Manager *m);
const char *manager_running_as_to_string(ManagerRunningAs i);
ManagerRunningAs manager_running_as_from_string(const char *s);
const char *manager_running_as_to_string(ManagerRunningAs i);
ManagerRunningAs manager_running_as_from_string(const char *s);
-
-#endif