diff options
| author | Ermal <eri@pfsense.org> | 2013-01-16 13:29:49 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-01-16 13:29:49 +0000 |
| commit | 76a7d8e4439e298bad0cafd2d4cf02173366423d (patch) | |
| tree | 098a39bd73c17c9888adb52815642d86b71a2dce /etc | |
| parent | 5cd73772aac7b2f487db95668191f43771bcab67 (diff) | |
| download | pfsense-76a7d8e4439e298bad0cafd2d4cf02173366423d.zip pfsense-76a7d8e4439e298bad0cafd2d4cf02173366423d.tar.gz | |
Merge git pull request 313 from bcyrill with some modifications
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.console.inc | 2 | ||||
| -rw-r--r-- | etc/inc/filter.inc | 7 | ||||
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 2 | ||||
| -rw-r--r-- | etc/inc/system.inc | 2 | ||||
| -rwxr-xr-x | etc/rc.bootup | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/etc/inc/config.console.inc b/etc/inc/config.console.inc index fed3948..f7494db 100644 --- a/etc/inc/config.console.inc +++ b/etc/inc/config.console.inc @@ -51,7 +51,7 @@ function set_networking_interfaces_ports() { $fp = fopen('php://stdin', 'r'); $memory = get_memory(); - $avail = $memory[0]; + $avail = $memory[1]; if($avail < $g['minimum_ram_warning']) { echo "\n\n\n"; diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 1949c38..7643b21 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -232,6 +232,13 @@ function filter_configure_sync($delete_states_if_needed = true) { /* User defined maximum table entries in Advanced menu. */ if ($config['system']['maximumtableentries'] <> "" && is_numeric($config['system']['maximumtableentries'])) $limitrules .= "set limit table-entries {$config['system']['maximumtableentries']}\n"; + else { + $memory = get_memory(); + if ($memory[0] < 135) + $limitrules .= "set limit table-entries 100000\n"; + else + $limitrules .= "set limit table-entries 200000\n"; + } if ($config['system']['optimization'] <> "") { $limitrules .= "set optimization {$config['system']['optimization']}\n"; diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 8afd528..36d04fe 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1509,7 +1509,7 @@ function is_fqdn($fqdn) { function pfsense_default_state_size() { /* get system memory amount */ $memory = get_memory(); - $avail = $memory[0]; + $avail = $memory[1]; /* Be cautious and only allocate 10% of system memory to the state table */ $max_states = (int) ($avail/10)*1000; return $max_states; diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 8dc00de..dc369b8 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -852,7 +852,7 @@ function system_generate_lighty_config($filename, $lighty_port = $port; $memory = get_memory(); - $avail = $memory[0]; + $avail = $memory[1]; // Determine web GUI process settings and take into account low memory systems if ($avail < 255) diff --git a/etc/rc.bootup b/etc/rc.bootup index f77a6f6..4e2ea79 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -126,7 +126,7 @@ echo "."; /* get system memory amount */ $memory = get_memory(); -$avail = $memory[0]; +$avail = $memory[1]; echo " done.\n"; conf_mount_rw(); |
