chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: cast mkdir() result to (void) to make sure coverity is quiet
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index 8e3c146b42e775b92e0f076b48e18b43fe1d7fbc..ab7254849c39306efed0113817259eadd71a56e5 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-33,8
+33,6
@@
/* Enforce upper limit how many names we allow */
#define MANAGER_MAX_NAMES 131072 /* 128K */
/* Enforce upper limit how many names we allow */
#define MANAGER_MAX_NAMES 131072 /* 128K */
-#define DEFAULT_MANAGER_START_TIMEOUT_USEC (15*USEC_PER_MINUTE)
-
typedef struct Manager Manager;
typedef enum ManagerState {
typedef struct Manager Manager;
typedef enum ManagerState {
@@
-62,6
+60,12
@@
typedef enum ManagerExitCode {
_MANAGER_EXIT_CODE_INVALID = -1
} ManagerExitCode;
_MANAGER_EXIT_CODE_INVALID = -1
} ManagerExitCode;
+typedef enum StatusType {
+ STATUS_TYPE_EPHEMERAL,
+ STATUS_TYPE_NORMAL,
+ STATUS_TYPE_EMERGENCY,
+} StatusType;
+
#include "unit.h"
#include "job.h"
#include "hashmap.h"
#include "unit.h"
#include "job.h"
#include "hashmap.h"
@@
-267,6
+271,11
@@
struct Manager {
unsigned n_on_console;
unsigned jobs_in_progress_iteration;
unsigned n_on_console;
unsigned jobs_in_progress_iteration;
+ /* Do we have any outstanding password prompts? */
+ int have_ask_password;
+ int ask_password_inotify_fd;
+ sd_event_source *ask_password_event_source;
+
/* Type=idle pipes */
int idle_pipe[4];
sd_event_source *idle_pipe_event_source;
/* Type=idle pipes */
int idle_pipe[4];
sd_event_source *idle_pipe_event_source;
@@
-284,12
+293,6
@@
struct Manager {
/* Used for processing polkit authorization responses */
Hashmap *polkit_registry;
/* Used for processing polkit authorization responses */
Hashmap *polkit_registry;
-
- /* System wide startup timeouts */
- usec_t start_timeout_usec;
- sd_event_source *start_timeout_event_source;
- FailureAction start_timeout_action;
- char *start_timeout_reboot_arg;
};
int manager_new(SystemdRunningAs running_as, bool test_run, Manager **m);
};
int manager_new(SystemdRunningAs running_as, bool test_run, Manager **m);
@@
-352,7
+355,7
@@
void manager_recheck_journal(Manager *m);
void manager_set_show_status(Manager *m, ShowStatus mode);
void manager_set_first_boot(Manager *m, bool b);
void manager_set_show_status(Manager *m, ShowStatus mode);
void manager_set_first_boot(Manager *m, bool b);
-void manager_status_printf(Manager *m,
bool ephemeral
, const char *status, const char *format, ...) _printf_(4,5);
+void manager_status_printf(Manager *m,
StatusType type
, const char *status, const char *format, ...) _printf_(4,5);
void manager_flip_auto_status(Manager *m, bool enable);
Set *manager_get_units_requiring_mounts_for(Manager *m, const char *path);
void manager_flip_auto_status(Manager *m, bool enable);
Set *manager_get_units_requiring_mounts_for(Manager *m, const char *path);