chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: add the ability for units to join other unit's PrivateNetwork= and PrivateTm...
[elogind.git]
/
src
/
core
/
mount.h
diff --git
a/src/core/mount.h
b/src/core/mount.h
index 30c6d9b249bdf74c69f98b3502698863a0a6cdce..a53423cc27bff97b171424e57dad47edc15798e7 100644
(file)
--- a/
src/core/mount.h
+++ b/
src/core/mount.h
@@
-25,6
+25,8
@@
typedef struct Mount Mount;
#include "unit.h"
#include "kill.h"
#include "unit.h"
#include "kill.h"
+#include "execute.h"
+#include "cgroup.h"
typedef enum MountState {
MOUNT_DEAD,
typedef enum MountState {
MOUNT_DEAD,
@@
-52,13
+54,6
@@
typedef enum MountExecCommand {
_MOUNT_EXEC_COMMAND_INVALID = -1
} MountExecCommand;
_MOUNT_EXEC_COMMAND_INVALID = -1
} MountExecCommand;
-typedef struct MountParameters {
- char *what;
- char *options;
- char *fstype;
- int passno;
-} MountParameters;
-
typedef enum MountResult {
MOUNT_SUCCESS,
MOUNT_FAILURE_RESOURCES,
typedef enum MountResult {
MOUNT_SUCCESS,
MOUNT_FAILURE_RESOURCES,
@@
-70,6
+65,12
@@
typedef enum MountResult {
_MOUNT_RESULT_INVALID = -1
} MountResult;
_MOUNT_RESULT_INVALID = -1
} MountResult;
+typedef struct MountParameters {
+ char *what;
+ char *options;
+ char *fstype;
+} MountParameters;
+
struct Mount {
Unit meta;
struct Mount {
Unit meta;
@@
-95,8
+96,12
@@
struct Mount {
usec_t timeout_usec;
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
usec_t timeout_usec;
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
+
ExecContext exec_context;
KillContext kill_context;
ExecContext exec_context;
KillContext kill_context;
+ CGroupContext cgroup_context;
+
+ ExecRuntime *exec_runtime;
MountState state, deserialized_state;
MountState state, deserialized_state;
@@
-104,20
+109,20
@@
struct Mount {
MountExecCommand control_command_id;
pid_t control_pid;
MountExecCommand control_command_id;
pid_t control_pid;
-
Watch timer_watch
;
+
sd_event_source *timer_event_source
;
};
extern const UnitVTable mount_vtable;
void mount_fd_event(Manager *m, int events);
};
extern const UnitVTable mount_vtable;
void mount_fd_event(Manager *m, int events);
-const char* mount_state_to_string(MountState i);
-MountState mount_state_from_string(const char *s);
+const char* mount_state_to_string(MountState i)
_const_
;
+MountState mount_state_from_string(const char *s)
_pure_
;
-const char* mount_exec_command_to_string(MountExecCommand i);
-MountExecCommand mount_exec_command_from_string(const char *s);
+const char* mount_exec_command_to_string(MountExecCommand i)
_const_
;
+MountExecCommand mount_exec_command_from_string(const char *s)
_pure_
;
-const char* mount_result_to_string(MountResult i);
-MountResult mount_result_from_string(const char *s);
+const char* mount_result_to_string(MountResult i)
_const_
;
+MountResult mount_result_from_string(const char *s)
_pure_
;
void warn_if_dir_nonempty(const char *unit, const char* where);
void warn_if_dir_nonempty(const char *unit, const char* where);