summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/automount.c5
-rw-r--r--src/mount.c4
-rw-r--r--src/special.h1
3 files changed, 10 insertions, 0 deletions
diff --git a/src/automount.c b/src/automount.c
index 39eb3dd01a..b5003b3a75 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -36,6 +36,7 @@
#include "unit-name.h"
#include "dbus-automount.h"
#include "bus-errors.h"
+#include "special.h"
static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
[AUTOMOUNT_DEAD] = UNIT_INACTIVE,
@@ -194,6 +195,10 @@ static int automount_load(Unit *u) {
if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(a->mount), true)) < 0)
return r;
+
+ if (a->meta.default_dependencies)
+ if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+ return r;
}
return automount_verify(a);
diff --git a/src/mount.c b/src/mount.c
index 498732eef1..57c258f9f2 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -367,6 +367,10 @@ static int mount_load(Unit *u) {
if ((r = unit_add_default_cgroup(u)) < 0)
return r;
+
+ if (m->meta.default_dependencies && !path_equal(m->where, "/"))
+ if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+ return r;
}
return mount_verify(m);
diff --git a/src/special.h b/src/special.h
index 9ddabde3a4..5ecdd3ccfa 100644
--- a/src/special.h
+++ b/src/special.h
@@ -29,6 +29,7 @@
* it to bring all services down that want to be brought down on
* system shutdown. */
#define SPECIAL_SHUTDOWN_TARGET "shutdown.target"
+#define SPECIAL_UMOUNT_TARGET "umount.target"
#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"