chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shutdown: respect the dry run option '-k'
[elogind.git]
/
src
/
manager.h
diff --git
a/src/manager.h
b/src/manager.h
index d8559f1bec40a7ccf580215e0929801606ca60a9..4557d5f0d5ed03081c70e8052b0f2965225045b6 100644
(file)
--- a/
src/manager.h
+++ b/
src/manager.h
@@
-93,7
+93,7
@@
struct Watch {
struct Manager {
/* Note that the set of units we know of is allowed to be
struct Manager {
/* Note that the set of units we know of is allowed to be
- * incosistent. However the subset of it that is loaded may
+ * inco
n
sistent. However the subset of it that is loaded may
* not, and the list of jobs may neither. */
/* Active jobs and units */
* not, and the list of jobs may neither. */
/* Active jobs and units */
@@
-102,7
+102,7
@@
struct Manager {
/* To make it easy to iterate through the units of a specific
* type we maintain a per type linked list */
/* To make it easy to iterate through the units of a specific
* type we maintain a per type linked list */
- LIST_HEAD(Meta, units_
per
_type[_UNIT_TYPE_MAX]);
+ LIST_HEAD(Meta, units_
by
_type[_UNIT_TYPE_MAX]);
/* Units that need to be loaded */
LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
/* Units that need to be loaded */
LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
@@
-148,7
+148,6
@@
struct Manager {
dual_timestamp startup_timestamp;
dual_timestamp finish_timestamp;
dual_timestamp startup_timestamp;
dual_timestamp finish_timestamp;
- char *console;
char *generator_unit_path;
/* Data specific to the device subsystem */
char *generator_unit_path;
/* Data specific to the device subsystem */
@@
-195,7
+194,7
@@
struct Manager {
int gc_marker;
unsigned n_in_gc_queue;
int gc_marker;
unsigned n_in_gc_queue;
- /* Make sure the user cannot accidentaly unmount our cgroup
+ /* Make sure the user cannot accidental
l
y unmount our cgroup
* file system */
int pin_cgroupfs_fd;
* file system */
int pin_cgroupfs_fd;
@@
-212,6
+211,8
@@
struct Manager {
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
+ bool taint_usr:1;
+
bool show_status;
bool confirm_spawn;
#ifdef HAVE_SYSV_COMPAT
bool show_status;
bool confirm_spawn;
#ifdef HAVE_SYSV_COMPAT
@@
-220,6
+221,9
@@
struct Manager {
bool mount_auto;
bool swap_auto;
bool mount_auto;
bool swap_auto;
+ ExecOutput default_std_output, default_std_error;
+
+ int n_serializing;
int n_deserializing;
unsigned n_installed_jobs;
int n_deserializing;
unsigned n_installed_jobs;
@@
-256,7
+260,6
@@
unsigned manager_dispatch_load_queue(Manager *m);
unsigned manager_dispatch_run_queue(Manager *m);
unsigned manager_dispatch_dbus_queue(Manager *m);
unsigned manager_dispatch_run_queue(Manager *m);
unsigned manager_dispatch_dbus_queue(Manager *m);
-int manager_set_console(Manager *m, const char *console);
int manager_set_default_controllers(Manager *m, char **controllers);
int manager_loop(Manager *m);
int manager_set_default_controllers(Manager *m, char **controllers);
int manager_loop(Manager *m);
@@
-285,6
+288,8
@@
void manager_check_finished(Manager *m);
void manager_run_generators(Manager *m);
void manager_undo_generators(Manager *m);
void manager_run_generators(Manager *m);
void manager_undo_generators(Manager *m);
+void manager_recheck_syslog(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);