From df3188cef0e0d7cee80aab4150fbd395dc446abe Mon Sep 17 00:00:00 2001 From: Jakub Kramarz Date: Sat, 14 Jun 2014 19:42:41 +0200 Subject: [PATCH] Added missing fallback from physical_block_size to hw_sector_size in sectorsize fact discovery for kernels older than May 2009. References #5761 --- lib/ansible/module_utils/facts.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index 177920c078e..43518464fa8 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -739,7 +739,9 @@ class LinuxHardware(Hardware): part['start'] = get_file_content(part_sysdir + "/start",0) part['sectors'] = get_file_content(part_sysdir + "/size",0) - part['sectorsize'] = get_file_content(part_sysdir + "/queue/physical_block_size",512) + part['sectorsize'] = get_file_content(part_sysdir + "/queue/physical_block_size") + if not part['sectorsize']: + part['sectorsize'] = get_file_content(part_sysdir + "/queue/hw_sector_size",512) part['size'] = module.pretty_bytes((float(part['sectors']) * float(part['sectorsize']))) d['partitions'][partname] = part @@ -756,7 +758,7 @@ class LinuxHardware(Hardware): d['sectors'] = 0 d['sectorsize'] = get_file_content(sysdir + "/queue/physical_block_size") if not d['sectorsize']: - d['sectorsize'] = 512 + d['sectorsize'] = get_file_content(sysdir + "/queue/hw_sector_size",512) d['size'] = module.pretty_bytes(float(d['sectors']) * float(d['sectorsize'])) d['host'] = ""