X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.h;h=2dcb663cb142fcef439b57a6e1b068eb24ee1391;hb=adeba5008eac3105ae59256dedd087ebe006a9e6;hp=9583eebe3aa198638c40bc957258c0b16fa79b7c;hpb=c2f1db8f83618e60dcded8303d14656d7d26b436;p=elogind.git

diff --git a/src/core/mount.h b/src/core/mount.h
index 9583eebe3..2dcb663cb 100644
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -24,6 +24,9 @@
 typedef struct Mount Mount;
 
 #include "unit.h"
+#include "kill.h"
+#include "execute.h"
+#include "cgroup.h"
 
 typedef enum MountState {
         MOUNT_DEAD,
@@ -51,13 +54,6 @@ typedef enum 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,
@@ -69,6 +65,12 @@ typedef enum MountResult {
         _MOUNT_RESULT_INVALID = -1
 } MountResult;
 
+typedef struct MountParameters {
+        char *what;
+        char *options;
+        char *fstype;
+} MountParameters;
+
 struct Mount {
         Unit meta;
 
@@ -86,6 +88,8 @@ struct Mount {
         bool just_mounted:1;
         bool just_changed:1;
 
+        bool sloppy_options;
+
         MountResult result;
         MountResult reload_result;
 
@@ -94,7 +98,12 @@ struct Mount {
         usec_t timeout_usec;
 
         ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
+
         ExecContext exec_context;
+        KillContext kill_context;
+        CGroupContext cgroup_context;
+
+        ExecRuntime *exec_runtime;
 
         MountState state, deserialized_state;
 
@@ -102,18 +111,20 @@ struct Mount {
         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);
 
-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) _const_;
+MountExecCommand mount_exec_command_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_result_to_string(MountResult i) _const_;
+MountResult mount_result_from_string(const char *s) _pure_;
 
-const char* mount_result_to_string(MountResult i);
-MountResult mount_result_from_string(const char *s);
+void warn_if_dir_nonempty(const char *unit, const char* where);