From affc3d834347076e8616948978e70ed1fca84db4 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com>
Date: Sun, 23 Nov 2014 20:33:38 -0800
Subject: mount: check options as well as fstype for network mounts
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.
---
src/core/mount.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
(limited to 'src')
diff --git a/src/core/mount.c b/src/core/mount.c
index e62a5f1b17..5f2de64eb9 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -64,18 +64,22 @@ 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_is_network(MountParameters *p) {
- assert(p);
-
- if (mount_test_option(p->options, "_netdev"))
+static bool mount_needs_network(const char *options, const char *fstype) {
+ if (mount_test_option(options, "_netdev"))
return true;
- if (p->fstype && fstype_is_network(p->fstype))
+ if (fstype && fstype_is_network(fstype))
return true;
return false;
}
+static bool mount_is_network(MountParameters *p) {
+ assert(p);
+
+ return mount_needs_network(p->options, p->fstype);
+}
+
static bool mount_is_bind(MountParameters *p) {
assert(p);
@@ -1412,8 +1416,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;
--
cgit v1.2.3-54-g00ecf