Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mount: cache blkid information #51135

Merged
merged 2 commits into from
Jan 10, 2019
Merged

mount: cache blkid information #51135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1ede1d
mount: cache blkid information
aplanas Jan 10, 2019
02e8de1
Merge branch 'develop' into fix_blkid
garethgreenaway Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion salt/modules/mount.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ def _active_mountinfo(ret):
msg = 'File not readable {0}'
raise CommandExecutionError(msg.format(filename))

blkid_info = __salt__['disk.blkid']()
if 'disk.blkid' not in __context__:
__context__['disk.blkid'] = __salt__['disk.blkid']()
blkid_info = __context__['disk.blkid']

with salt.utils.files.fopen(filename) as ifile:
for line in ifile:
Expand Down