Mount module already had an inventory-suitable function, just using that.

1 files changed, 1 insertions, 15 deletions

diff --git a/func/minion/modules/mount.py b/func/minion/modules/mount.py
index 2ca15fe..02463e4 100644
--- a/func/minion/modules/mount.py
+++ b/func/minion/modules/mount.py
@@ -82,21 +82,7 @@ class MountModule(func_module.FuncModule):
             return False
 
     def inventory(self, flatten=True):
-        cmd = sub_process.Popen(["/bin/mount"], stdout=sub_process.PIPE, shell=False)
-        output = cmd.communicate()[0]
-        lines = output.split("\n")
-        results = []
-        for line in lines:
-            if line.find(" on ") == -1:
-                continue
-            (resource,rest) = line.split(" on ")
-            (mountpoint,mtype) = rest.split(" type ")
-            (realtype, params) = mtype.split(None)
-            params = params.replace("(","")
-            params = params.replace(")","")
-            paramlist = params.split(",")
-            results.append([resource,mountpoint,realtype,paramlist])
-        return results
+        return self.list()
 
 
 methods = MountModule()