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

wanted and current devices comparison and display

Browse Source 
- only get realpath of wanted device if it is a local path (begins with '/')
- build a current devices list for simple comparison and display
- display wanted (+ realpath) and current devices if different (changes)
- use active[name] construction instead of active.__getitem__(name):
  http://docs.python.org/2/reference/datamodel.html#special-method-names
This commit is contained in:
Christophe Drevet-Droguet 2013-12-09 09:36:34 +01:00
parent 8d21ac38e0
commit 19437de96c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/states/mount.py
View File

@ -86,15 +86,22 @@ def mounted(name,
# Get the active data
active = __salt__['mount.active']()
real_name = os.path.realpath(name)
real_device = os.path.realpath(device)
if device[0:1] == "/":
real_device = os.path.realpath(device)
else:
real_device = device
device_list = [active[real_name]['device']]
device_list.append(os.path.realpath(device_list[0]))
if active[real_name]['alt_device'] not in device_list:
device_list.append(active[real_name]['alt_device'])
if real_name in active:
if real_device != os.path.realpath(active.__getitem__(real_name).__getitem__('device')) \
or device != active.__getitem__(real_name).__getitem__('alt_device'):
if real_device not in device_list:
# name matches but device doesn't - need to umount
ret['changes']['umount'] = "Forced unmount because devices " \
+ "don't match. Wanted: " + device
if real_device != device:
ret['changes']['umount'] += " (" + real_device + ")"
ret['changes']['umount'] += ", current: " + ', '.join(device_list)
out = __salt__['mount.umount'](real_name)
active = __salt__['mount.active']()
if real_name in active: