diff options
| author | Phil Davis <phil.davis@world.inf.org> | 2013-09-02 04:12:47 -0700 |
|---|---|---|
| committer | Phil Davis <phil.davis@world.inf.org> | 2013-09-02 04:12:47 -0700 |
| commit | 0c3a7a05f9dd5f94ae17ec0c524baf00a91a0db0 (patch) | |
| tree | 2372d98057397394fffe9f1c05c4a6e0d10a038e /etc/inc/config.console.inc | |
| parent | d613b9d52225278d1319626b5508c91ea7b6935d (diff) | |
| download | pfsense-0c3a7a05f9dd5f94ae17ec0c524baf00a91a0db0.zip pfsense-0c3a7a05f9dd5f94ae17ec0c524baf00a91a0db0.tar.gz | |
Use updated get_memory var names
Backport to 2.1
Diffstat (limited to 'etc/inc/config.console.inc')
| -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"; |
