chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install: fix incorrect 'Access denied' message with a non-existent unit
[elogind.git]
/
src
/
mount.h
diff --git
a/src/mount.h
b/src/mount.h
index 4732902ef3c91b2a895d23eb67d20066d2db5e0d..9318444249c33e5838dd0c01551eae35140ac212 100644
(file)
--- a/
src/mount.h
+++ b/
src/mount.h
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
#ifndef foomounthfoo
#define foomounthfoo
#ifndef foomounthfoo
#define foomounthfoo
@@
-39,7
+39,7
@@
typedef enum MountState {
MOUNT_REMOUNTING_SIGKILL,
MOUNT_UNMOUNTING_SIGTERM,
MOUNT_UNMOUNTING_SIGKILL,
MOUNT_REMOUNTING_SIGKILL,
MOUNT_UNMOUNTING_SIGTERM,
MOUNT_UNMOUNTING_SIGKILL,
- MOUNT_
MAINTENANCE
,
+ MOUNT_
FAILED
,
_MOUNT_STATE_MAX,
_MOUNT_STATE_INVALID = -1
} MountState;
_MOUNT_STATE_MAX,
_MOUNT_STATE_INVALID = -1
} MountState;
@@
-56,10
+56,22
@@
typedef struct MountParameters {
char *what;
char *options;
char *fstype;
char *what;
char *options;
char *fstype;
+ int passno;
} MountParameters;
} MountParameters;
+typedef enum MountResult {
+ MOUNT_SUCCESS,
+ MOUNT_FAILURE_RESOURCES,
+ MOUNT_FAILURE_TIMEOUT,
+ MOUNT_FAILURE_EXIT_CODE,
+ MOUNT_FAILURE_SIGNAL,
+ MOUNT_FAILURE_CORE_DUMP,
+ _MOUNT_RESULT_MAX,
+ _MOUNT_RESULT_INVALID = -1
+} MountResult;
+
struct Mount {
struct Mount {
-
Meta
meta;
+
Unit
meta;
char *where;
char *where;
@@
-77,19
+89,18
@@
struct Mount {
bool just_mounted:1;
bool just_changed:1;
bool just_mounted:1;
bool just_changed:1;
- bool failure:1;
-
- usec_t timeout_usec;
+ MountResult result;
+ MountResult reload_result;
mode_t directory_mode;
mode_t directory_mode;
+ usec_t timeout_usec;
+
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
ExecContext exec_context;
MountState state, deserialized_state;
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
ExecContext exec_context;
MountState state, deserialized_state;
- KillMode kill_mode;
-
ExecCommand* control_command;
MountExecCommand control_command_id;
pid_t control_pid;
ExecCommand* control_command;
MountExecCommand control_command_id;
pid_t control_pid;
@@
-101,12
+112,13
@@
extern const UnitVTable mount_vtable;
void mount_fd_event(Manager *m, int events);
void mount_fd_event(Manager *m, int events);
-int mount_path_is_mounted(Manager *m, const char* path);
-
const char* mount_state_to_string(MountState i);
MountState mount_state_from_string(const char *s);
const char* mount_exec_command_to_string(MountExecCommand i);
MountExecCommand mount_exec_command_from_string(const char *s);
const char* mount_state_to_string(MountState i);
MountState mount_state_from_string(const char *s);
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);
+MountResult mount_result_from_string(const char *s);
+
#endif
#endif