chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: add simple only-by-dependency flag for units
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index 921984c1c116a6446ed4bb6facad915b5ac4a87b..01fc2dffbbee3bbbe057b27511f5f98b675e9fd8 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-267,9
+267,12
@@
static int mount_verify(Mount *m) {
char *e;
assert(m);
char *e;
assert(m);
- if (
UNIT(m)
->meta.load_state != UNIT_LOADED)
+ if (
m
->meta.load_state != UNIT_LOADED)
return 0;
return 0;
+ if (!m->from_etc_fstab && !m->from_fragment && !m->from_proc_self_mountinfo)
+ return -ENOENT;
+
if (!(e = unit_name_from_path(m->where, ".mount")))
return -ENOMEM;
if (!(e = unit_name_from_path(m->where, ".mount")))
return -ENOMEM;
@@
-933,7
+936,7
@@
static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
case MOUNT_REMOUNTING_SIGKILL:
case MOUNT_REMOUNTING_SIGTERM:
case MOUNT_REMOUNTING_SIGKILL:
case MOUNT_REMOUNTING_SIGTERM:
- if (success
&& m->from_proc_self_mountinfo
)
+ if (success)
mount_enter_mounted(m, true);
else if (m->from_proc_self_mountinfo)
mount_enter_mounted(m, false);
mount_enter_mounted(m, true);
else if (m->from_proc_self_mountinfo)
mount_enter_mounted(m, false);