Merge pull request #30784 from rallytime/bp-24952

Back-port #24952 to 2015.5
This commit is contained in:
Mike Place 2016-02-01 14:43:01 -07:00
commit 80a36793cb

View File

@ -271,7 +271,7 @@ def save_config():
salt '*' raid.save_config
'''
scan = __salt__['cmd.run']('mdadm --detail --scan', python_shell=False).split()
scan = __salt__['cmd.run']('mdadm --detail --scan', python_shell=False).splitlines()
# Issue with mdadm and ubuntu
# REF: http://askubuntu.com/questions/209702/why-is-my-raid-dev-md1-showing-up-as-dev-md126-is-mdadm-conf-being-ignored
if __grains__['os'] == 'Ubuntu':