udev: support ENV{}=="" global property matches

[elogind.git] / src / core / mount.h

diff --git a/src/core/mount.h b/src/core/mount.h
index a9550697e59a150bb9aa46c110ac1bf7ae394f56..2dcb663cb142fcef439b57a6e1b068eb24ee1391 100644 (file)
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -54,12 +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;
-} MountParameters;
-

 typedef enum MountResult {
         MOUNT_SUCCESS,
         MOUNT_FAILURE_RESOURCES,
 typedef enum MountResult {
         MOUNT_SUCCESS,
         MOUNT_FAILURE_RESOURCES,


@@ -71,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;
 


@@ -88,6 +88,8 @@ struct Mount {
         bool just_mounted:1;
         bool just_changed:1;
 
         bool just_mounted:1;
         bool just_changed:1;
 

+        bool sloppy_options;
+

         MountResult result;
         MountResult reload_result;
 
         MountResult result;
         MountResult reload_result;
 


@@ -101,13 +103,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;