Revert "Manually backport the freebsd and lvm fixes to mount.py"

This reverts commit 0bc993be83927ef6c5f11a2f68813608a5b8fc1b.

Revert mount changes for 2.1.2.  They are causing regressions so it's
too late for 2.1.2.

1 files changed, 1 insertions, 10 deletions

diff --git a/system/mount.py b/system/mount.py
index 59b30175..938f683f 100644
--- a/system/mount.py
+++ b/system/mount.py
@@ -353,12 +353,7 @@ def is_bind_mounted(module, dest, src=None, fstype=None):
         if get_platform().lower() == 'linux':
             result = mount_pattern.search(arguments[1])
 
-            # This is only for LVM and tmpfs mounts
-            if result is not None and len(result.groups()) == 1:
-                source = result.group(1)
-
-            if src is None:
-                # That's for unmounted/absent
+            if len(result.groups()) == 1:
                 if arguments[0] == dest:
                     is_mounted = True
         elif (
@@ -399,10 +394,6 @@ def main():
         'name': module.params['name']
     }
 
-    # FreeBSD doesn't have any 'default' so set 'rw' instead
-    if get_platform() == 'FreeBSD':
-        args['opts'] = 'rw'
-
     if module.params['src'] is not None:
         args['src'] = module.params['src']
     if module.params['fstype'] is not None: