When creating a new mount unit after an event on /proc/self/mountinfo,
check the mount options as well as the fstype to determine if this is a
remote mount that requires network access.
Signed-off-by: Chris Leech <cle...@redhat.com>
---
src/core/mount.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
index 74a1da8..81e9fde 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -63,16 +63,20 @@ static const UnitActiveState
state_translation_table[_MOUNT_STATE_MAX] = {
static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void
*userdata);
static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t
revents, void *userdata);
+static bool mount_needs_network(const char *options, const char *fstype) {
+ if (mount_test_option(options, "_netdev"))
+ return true;
+
+ if (fstype && fstype_is_network(fstype))
+ return true;
+
+ return false;
+}
+
static bool mount_is_network(MountParameters *p) {
assert(p);
- if (mount_test_option(p->options, "_netdev"))
- return true;
-
- if (p->fstype && fstype_is_network(p->fstype))
- return true;
-
- return false;
+ return mount_needs_network(p->options, p->fstype);
}
static bool mount_is_bind(MountParameters *p) {
@@ -1403,8 +1407,7 @@ static int mount_add_one(
if (m->running_as == SYSTEMD_SYSTEM) {
const char* target;
- target = fstype_is_network(fstype) ?
SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
-
+ target = mount_needs_network(options, fstype) ?
SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
r = unit_add_dependency_by_name(u, UNIT_BEFORE,
target, NULL, true);
if (r < 0)
goto fail;
--
1.9.3
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
