valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #45232 from rasathus/2016.11

Browse Source 
Backport #27160 to 2016.11
This commit is contained in:
Nicole Thomas 2018-01-02 10:48:22 -05:00 committed by GitHub
commit 40fb30f63f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/mount.py
View File

@ -82,7 +82,7 @@ def _active_mountinfo(ret):
'root': comps[3],
'opts': _resolve_user_group_names(comps[5].split(',')),
'fstype': comps[_sep + 1],
'device': device_name,
'device': device_name.replace('\\040', '\\ '),
'alt_device': _list.get(comps[4], None),
'superopts': _resolve_user_group_names(comps[_sep + 3].split(',')),
'device_uuid': device_uuid,
@ -539,7 +539,7 @@ def set_fstab(
# preserve arguments for updating
entry_args = {
'name': name,
'device': device,
'device': device.replace('\\ ', '\\040'),
'fstype': fstype,
'opts': opts,
'dump': dump,