chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute: setup namespace after doing NSS calls
[elogind.git]
/
src
/
manager.h
diff --git
a/src/manager.h
b/src/manager.h
index a2084e924bae6ec36fe017894426e241ff777961..070a27f70b2348fc29274bb54861110ac9930458 100644
(file)
--- a/
src/manager.h
+++ b/
src/manager.h
@@
-56,6
+56,7
@@
typedef enum ManagerRunningAs {
enum WatchType {
WATCH_INVALID,
WATCH_SIGNAL,
enum WatchType {
WATCH_INVALID,
WATCH_SIGNAL,
+ WATCH_NOTIFY,
WATCH_FD,
WATCH_TIMER,
WATCH_MOUNT,
WATCH_FD,
WATCH_TIMER,
WATCH_MOUNT,
@@
-82,6
+83,7
@@
struct Watch {
#include "list.h"
#include "set.h"
#include "dbus.h"
#include "list.h"
#include "set.h"
#include "dbus.h"
+#include "path-lookup.h"
#define SPECIAL_DEFAULT_TARGET "default.target"
#define SPECIAL_DEFAULT_TARGET "default.target"
@@
-170,15
+172,14
@@
struct Manager {
Hashmap *watch_pids; /* pid => Unit object n:1 */
Hashmap *watch_pids; /* pid => Unit object n:1 */
+ Watch notify_watch;
Watch signal_watch;
int epoll_fd;
unsigned n_snapshots;
Watch signal_watch;
int epoll_fd;
unsigned n_snapshots;
- char **unit_path;
- char **sysvinit_path;
- char **sysvrcnd_path;
+ LookupPaths lookup_paths;
char **environment;
char **environment;
@@
-216,7
+217,6
@@
struct Manager {
char *cgroup_hierarchy;
usec_t gc_queue_timestamp;
char *cgroup_hierarchy;
usec_t gc_queue_timestamp;
-
int gc_marker;
unsigned n_in_gc_queue;
int gc_marker;
unsigned n_in_gc_queue;