chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: actually make SwitchRoot() bus call do the deed
[elogind.git]
/
src
/
core
/
mount.h
diff --git
a/src/core/mount.h
b/src/core/mount.h
index ad9efc34d5f86996aee6729fb3fbb1331be92825..2edb75eb544c55a63cb2bf14bb63bc5f66776088 100644
(file)
--- a/
src/core/mount.h
+++ b/
src/core/mount.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foomounthfoo
-#define foomounthfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-25,6
+24,9
@@
typedef struct Mount Mount;
#include "unit.h"
typedef struct Mount Mount;
#include "unit.h"
+#include "kill.h"
+#include "execute.h"
+#include "cgroup.h"
typedef enum MountState {
MOUNT_DEAD,
typedef enum MountState {
MOUNT_DEAD,
@@
-56,7
+58,6
@@
typedef struct MountParameters {
char *what;
char *options;
char *fstype;
char *what;
char *options;
char *fstype;
- int passno;
} MountParameters;
typedef enum MountResult {
} MountParameters;
typedef enum MountResult {
@@
-95,7
+96,10
@@
struct Mount {
usec_t timeout_usec;
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
usec_t timeout_usec;
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
+
ExecContext exec_context;
ExecContext exec_context;
+ KillContext kill_context;
+ CGroupContext cgroup_context;
MountState state, deserialized_state;
MountState state, deserialized_state;
@@
-103,20
+107,20
@@
struct Mount {
MountExecCommand control_command_id;
pid_t control_pid;
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);
};
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);
-MountExecCommand mount_exec_command_from_string(const char *s);
+const char* mount_exec_command_to_string(MountExecCommand i)
_const_
;
+MountExecCommand mount_exec_command_from_string(const char *s)
_pure_
;
-const char* mount_result_to_string(MountResult i);
-MountResult mount_result_from_string(const char *s);
+const char* mount_result_to_string(MountResult i)
_const_
;
+MountResult mount_result_from_string(const char *s)
_pure_
;
-#endif
+void warn_if_dir_nonempty(const char *unit, const char* where);