From c3cb39dfa02d587315217a24fbf909d8b2ddca71 Mon Sep 17 00:00:00 2001
From: 0tmc <atokarchuk@rutube.ru>
Date: Fri, 8 May 2015 12:22:37 +0300
Subject: [PATCH] Use of proper fstab file on FreeBSD

---
 system/mount.py | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/system/mount.py b/system/mount.py
index e11d497220b..eed72d2d7c9 100644
--- a/system/mount.py
+++ b/system/mount.py
@@ -206,13 +206,29 @@ def unset_mount(**kwargs):
 
 def mount(module, **kwargs):
     """ mount up a path or remount if needed """
+
+    # kwargs: name, src, fstype, opts, dump, passno, state, fstab=/etc/fstab
+    args = dict(
+        opts   = 'default',
+        dump   = '0',
+        passno = '0',
+        fstab  = '/etc/fstab'
+    )
+    args.update(kwargs)
+
     mount_bin = module.get_bin_path('mount')
 
     name = kwargs['name']
+    
+    cmd = [ mount_bin, ]
+    
     if os.path.ismount(name):
-        cmd = [ mount_bin , '-o', 'remount', name ]
-    else:
-        cmd = [ mount_bin, name ]
+        cmd += [ '-o', 'remount', ]
+
+    if get_platform().lower() == 'freebsd':
+        cmd += [ '-F', args['fstab'], ]
+
+    cmd += [ name, ]
 
     rc, out, err = module.run_command(cmd)
     if rc == 0: