_active_mounts_openbsd: unbreak output for special filesystems

mount(8) output is a little bit different on OpenBSD between local and special or remote filesystems (e.g. tmpfs or nfs). These do not use a UUID nor a device. saltstack#34012
rallytime · Jun 20, 2016 · f7be5e1 · f7be5e1
1 parent 6f03d06
commit f7be5e1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/salt/modules/mount.py b/salt/modules/mount.py
@@ -140,10 +140,10 @@ def _active_mounts_openbsd(ret):
     '''
     for line in __salt__['cmd.run_stdout']('mount -v').split('\n'):
         comps = re.sub(r"\s+", " ", line).split()
-        nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
-        nod = ' '.join(nod.split()).split(" ")
         parens = re.findall(r'\((.*?)\)', line, re.DOTALL)
         if len(parens) > 1:
+            nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
+            nod = ' '.join(nod.split()).split(" ")
             ret[comps[3]] = {'device': comps[0],
                          'fstype': comps[5],
                          'opts': _resolve_user_group_names(parens[1].split(", ")),
@@ -153,7 +153,7 @@ def _active_mounts_openbsd(ret):
         else:
             ret[comps[2]] = {'device': comps[0],
                             'fstype': comps[4],
-                            'opts': _resolve_user_group_names(parens[1].split(", "))}
+                            'opts': _resolve_user_group_names(parens[0].split(", "))}
     return ret