chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
automount: add DirectoryMode= setting
[elogind.git]
/
src
/
automount.c
diff --git
a/src/automount.c
b/src/automount.c
index 5e669c5d323a4b657e741176790f77d402b37bec..b8d7ad25f4d9a938bf1bb9c21df19497d2cb6c2e 100644
(file)
--- a/
src/automount.c
+++ b/
src/automount.c
@@
-53,6
+53,8
@@
static void automount_init(Unit *u) {
a->pipe_watch.fd = a->pipe_fd = -1;
a->pipe_watch.type = WATCH_INVALID;
a->pipe_watch.fd = a->pipe_fd = -1;
a->pipe_watch.type = WATCH_INVALID;
+
+ a->directory_mode = 0755;
}
static void repeat_unmout(const char *path) {
}
static void repeat_unmout(const char *path) {
@@
-253,9
+255,11
@@
static void automount_dump(Unit *u, FILE *f, const char *prefix) {
fprintf(f,
"%sAutomount State: %s\n"
fprintf(f,
"%sAutomount State: %s\n"
- "%sWhere: %s\n",
+ "%sWhere: %s\n"
+ "%sDirectoryMode: %04o\n",
prefix, automount_state_to_string(a->state),
prefix, automount_state_to_string(a->state),
- prefix, a->where);
+ prefix, a->where,
+ prefix, a->directory_mode);
}
static void automount_enter_dead(Automount *a, bool success) {
}
static void automount_enter_dead(Automount *a, bool success) {
@@
-536,9
+540,10
@@
static void automount_enter_runnning(Automount *a) {
assert(a);
assert(a->mount);
assert(a);
assert(a->mount);
- /* Before we do anything, let's see if somebody is playing games with us? */
+ mkdir_p(a->where, a->directory_mode);
- if (stat(a->where, &st) < 0) {
+ /* Before we do anything, let's see if somebody is playing games with us? */
+ if (lstat(a->where, &st) < 0) {
log_warning("%s failed stat automount point: %m", a->meta.id);
goto fail;
}
log_warning("%s failed stat automount point: %m", a->meta.id);
goto fail;
}