diff options
author | Phil Davis <phil.davis@world.inf.org> | 2013-08-28 13:05:10 -0700 |
---|---|---|
committer | Phil Davis <phil.davis@world.inf.org> | 2013-08-28 13:05:10 -0700 |
commit | 493360f50a16b931e8db5ebf32d980d5b806bba3 (patch) | |
tree | 6dda3e781c73b37221cae2d0cd6f6a26aa24df25 | |
parent | 517fb89ed659d418fceb75823334da02d4b5d09a (diff) | |
download | pfsense-493360f50a16b931e8db5ebf32d980d5b806bba3.zip pfsense-493360f50a16b931e8db5ebf32d980d5b806bba3.tar.gz |
Use updated get_memory var names
The value of minimum_ram_warning is designed to be compared to hw.physmem - so do that. Usse the appropriate physmem or realmem value in each place.
-rw-r--r-- | etc/inc/config.console.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/config.console.inc b/etc/inc/config.console.inc index f7494db..6c290c0 100644 --- a/etc/inc/config.console.inc +++ b/etc/inc/config.console.inc @@ -51,13 +51,14 @@ function set_networking_interfaces_ports() { $fp = fopen('php://stdin', 'r'); $memory = get_memory(); - $avail = $memory[1]; + $physmem = $memory[0]; + $realmem = $memory[1]; - if($avail < $g['minimum_ram_warning']) { + if($physmem < $g['minimum_ram_warning']) { echo "\n\n\n"; echo gettext("DANGER! WARNING! ACHTUNG!") . "\n\n"; printf(gettext("%s requires *AT LEAST* %s RAM to function correctly.%s"), $g['product_name'], $g['minimum_ram_warning_text'], "\n"); - printf(gettext("Only (%s) MB RAM has been detected.%s"), $avail, "\n"); + printf(gettext("Only (%s) MB RAM has been detected, with (%s) available to %s.%s"), $realmem, $physmem, $g['product_name'], "\n"); echo "\n" . gettext("Press ENTER to continue.") . " "; fgets($fp); echo "\n"; |