chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exec: Ignore the setting SELinuxContext if selinux is not enabled
[elogind.git]
/
src
/
core
/
mount.h
diff --git
a/src/core/mount.h
b/src/core/mount.h
index 7cd4320d94e5ed7551211a5115ffdc2f00862a37..a53423cc27bff97b171424e57dad47edc15798e7 100644
(file)
--- a/
src/core/mount.h
+++ b/
src/core/mount.h
@@
-54,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,
@@
-72,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;
@@
-102,13
+101,15
@@
struct Mount {
KillContext kill_context;
CGroupContext cgroup_context;
KillContext kill_context;
CGroupContext cgroup_context;
+ ExecRuntime *exec_runtime;
+
MountState state, deserialized_state;
ExecCommand* control_command;
MountExecCommand control_command_id;
pid_t control_pid;
MountState state, deserialized_state;
ExecCommand* control_command;
MountExecCommand control_command_id;
pid_t control_pid;
-
Watch timer_watch
;
+
sd_event_source *timer_event_source
;
};
extern const UnitVTable mount_vtable;
};
extern const UnitVTable mount_vtable;