openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Revert "Fix discoverd bug when dmidecode reports GB""

This commit is contained in:
Jenkins 2016-01-17 14:26:57 +00:00 committed by Gerrit Code Review
parent cd9fdf05e9 994e78209c
commit e52fbdc598
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/ironic-discoverd-ramdisk/init.d/80-ironic-discoverd-ramdisk
View File

@ -44,7 +44,7 @@ CPU_ARCH=$(lscpu | grep Architecture | awk '{ print $2 }')
update ".cpu_arch = \"$CPU_ARCH\""
RAM=0
for i in $(dmidecode --type memory | awk '($0~/Size/ && $2~/[0-9]/) {($3~/GB/) ? size=$2*1024 : size=$2; {print size;}}')
for i in $(dmidecode --type memory | grep Size | awk '{ print $2; }' | grep -E '[0-9]+');
do
RAM=$(( RAM + $i ));
done