summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-09-29 07:15:17 -0700
committerToshio Kuratomi <a.badger@gmail.com>2016-09-29 07:15:17 -0700
commit80c53ec210364cdc30700b984652dcadef6d9d5e (patch)
tree23a5385d6cc3585548d806fa937a19d98dedde79
parentbebf8054b50d14331ddc24071a4944ee0a5fd8c5 (diff)
downloadansible-modules-core-80c53ec210364cdc30700b984652dcadef6d9d5e.tar.gz
Revert "Fix mount backport"
This reverts commit 335d3315581d4b59137809b09b4edd7a850a706f. Reverting mount fixes to 2.1.2. changes are having regression effects so it's too late to get this in for 2.1.2.
-rw-r--r--system/mount.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/system/mount.py b/system/mount.py
index 0428a9eb..7076d9fa 100644
--- a/system/mount.py
+++ b/system/mount.py
@@ -351,7 +351,6 @@ def is_bind_mounted(module, dest, src=None, fstype=None):
arguments = mnt.split()
if get_platform().lower() == 'linux':
- source = arguments[1]
result = mount_pattern.search(arguments[1])
# This is only for LVM and tmpfs mounts
@@ -362,18 +361,6 @@ def is_bind_mounted(module, dest, src=None, fstype=None):
# That's for unmounted/absent
if arguments[0] == dest:
is_mounted = True
- else:
- # That's for mounted
- if arguments[0] == dest and source == src:
- is_mounted = True
- elif arguments[0] == dest and src.endswith(source):
- # Check if it's tmpfs mount
- sub_path = src[:len(src)-len(source)]
-
- if (
- is_bind_mounted(module, sub_path, 'tmpfs') and
- source == src[len(sub_path):]):
- is_mounted = True
elif (
(arguments[0] == src or src is None) and
arguments[2] == dest and