Backport #27160 to 2016.11

This commit is contained in:
Chris Fane 2017-12-18 21:07:06 +00:00
parent 4d6d640381
commit de53c45c29

View File

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