Merge pull request #28364 from jtand/blockdev_test_fix

In CentOS 5 the .split() causes a stacktrace.
This commit is contained in:
Mike Place 2015-10-28 14:46:02 -06:00
commit 072eb98a26

View file

@ -223,7 +223,7 @@ def fstype(device):
# itself for its type
df_out = __salt__['cmd.run']('df -T {0}'.format(device)).splitlines()
if len(df_out) > 1:
fs_type = df_out[1].split()[1]
fs_type = df_out[1]
if fs_type:
return fs_type