chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: ignore SIGKILL and SIGPIPE so that nothing intereferes with us
[elogind.git]
/
mount.h
diff --git
a/mount.h
b/mount.h
index 60585defc8dbe3b5323a558f20f7b802ce5f5b89..66992e10eb9024483f57e6eecbf750f4ebd57e95 100644
(file)
--- a/
mount.h
+++ b/
mount.h
@@
-28,31
+28,76
@@
typedef struct Mount Mount;
typedef enum MountState {
MOUNT_DEAD,
typedef enum MountState {
MOUNT_DEAD,
- MOUNT_MOUNTING,
+ MOUNT_MOUNTING, /* /bin/mount is running, but the mount is not done yet. */
+ MOUNT_MOUNTING_DONE, /* /bin/mount is running, and the mount is done. */
MOUNT_MOUNTED,
MOUNT_MOUNTED,
+ MOUNT_REMOUNTING,
MOUNT_UNMOUNTING,
MOUNT_UNMOUNTING,
+ MOUNT_MOUNTING_SIGTERM,
+ MOUNT_MOUNTING_SIGKILL,
+ MOUNT_REMOUNTING_SIGTERM,
+ MOUNT_REMOUNTING_SIGKILL,
+ MOUNT_UNMOUNTING_SIGTERM,
+ MOUNT_UNMOUNTING_SIGKILL,
MOUNT_MAINTAINANCE,
MOUNT_MAINTAINANCE,
- _MOUNT_STATE_MAX
+ _MOUNT_STATE_MAX,
+ _MOUNT_STATE_INVALID = -1
} MountState;
} MountState;
+typedef enum MountExecCommand {
+ MOUNT_EXEC_MOUNT,
+ MOUNT_EXEC_UNMOUNT,
+ MOUNT_EXEC_REMOUNT,
+ _MOUNT_EXEC_COMMAND_MAX,
+ _MOUNT_EXEC_COMMAND_INVALID = -1
+} MountExecCommand;
+
+typedef struct MountParameters {
+ char *what;
+ char *options;
+ char *fstype;
+} MountParameters;
+
struct Mount {
Meta meta;
struct Mount {
Meta meta;
-
MountState stat
e;
+
char *wher
e;
- char *what, *where;
+ MountParameters parameters_etc_fstab;
+ MountParameters parameters_proc_self_mountinfo;
+ MountParameters parameters_fragment;
bool from_etc_fstab:1;
bool from_proc_self_mountinfo:1;
bool from_etc_fstab:1;
bool from_proc_self_mountinfo:1;
+ bool from_fragment:1;
/* Used while looking for mount points that vanished or got
* added from/to /proc/self/mountinfo */
/* Used while looking for mount points that vanished or got
* added from/to /proc/self/mountinfo */
- bool still_exists:1;
- bool just_created:1;
+ bool is_mounted:1;
+ bool just_mounted:1;
+ bool just_changed:1;
+
+ bool failure:1;
+
+ usec_t timeout_usec;
+
+ ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
+ ExecContext exec_context;
+
+ MountState state;
+
+ KillMode kill_mode;
+
+ ExecCommand* control_command;
+ pid_t control_pid;
+
+ Watch timer_watch;
};
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);
+int mount_path_is_mounted(Manager *m, const char* path);
+
#endif
#endif