Skip to content

A
ansible
Commit 395192ff by James Cammarata
Options

Merge pull request #7740 from jkramarz/issue-5761 

changed sector size fact source
parents c548d0fb 4e4c9235
Showing with 2 additions and 2 deletions
lib/ansible/module_utils/facts.py
...@@ -739,7 +739,7 @@ class LinuxHardware(Hardware): ...@@ -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): ...@@ -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']))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment