cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7740 from jkramarz/issue-5761

Browse source 
changed sector size fact source
This commit is contained in:
James Cammarata 2014-06-12 08:56:03 -05:00
commit 395192ffbc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/facts.py
View file

@ -739,7 +739,7 @@ class LinuxHardware(Hardware):
part['start'] = get_file_content(part_sysdir + "/start",0) part['start'] = get_file_content(part_sysdir + "/start",0)
part['sectors'] = get_file_content(part_sysdir + "/size",0) part['sectors'] = get_file_content(part_sysdir + "/size",0)
part['sectorsize'] = get_file_content(part_sysdir + "/queue/hw_sector_size",512) part['sectorsize'] = get_file_content(part_sysdir + "/queue/physical_block_size",512)
part['size'] = module.pretty_bytes((float(part['sectors']) * float(part['sectorsize']))) part['size'] = module.pretty_bytes((float(part['sectors']) * float(part['sectorsize'])))
d['partitions'][partname] = part d['partitions'][partname] = part
@ -754,7 +754,7 @@ class LinuxHardware(Hardware):
d['sectors'] = get_file_content(sysdir + "/size") d['sectors'] = get_file_content(sysdir + "/size")
if not d['sectors']: if not d['sectors']:
d['sectors'] = 0 d['sectors'] = 0
d['sectorsize'] = get_file_content(sysdir + "/queue/hw_sector_size") d['sectorsize'] = get_file_content(sysdir + "/queue/physical_block_size")
if not d['sectorsize']: if not d['sectorsize']:
d['sectorsize'] = 512 d['sectorsize'] = 512
d['size'] = module.pretty_bytes(float(d['sectors']) * float(d['sectorsize'])) d['size'] = module.pretty_bytes(float(d['sectors']) * float(d['sectorsize']))