Commit 343c0992 authored by Franco Fichtner's avatar Franco Fichtner

inc: remove minimum RAM warning

Either the RAM requirements have increased, or hardware has
increased.  Simply stating the arbitrary and obvious while
doing things of little value to `fix' the situation it is
probably better to just force an old-fashioned out of memory,
which is mostly the point where the user realises that it is
not going to work anyway.
parent 9002010c
...@@ -38,20 +38,6 @@ function set_networking_interfaces_ports() ...@@ -38,20 +38,6 @@ function set_networking_interfaces_ports()
$fp = fopen('php://stdin', 'r'); $fp = fopen('php://stdin', 'r');
$memory = get_memory();
$physmem = $memory[0];
$realmem = $memory[1];
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, with (%s) available to %s.%s"), $realmem, $physmem, $g['product_name'], "\n");
echo "\n" . gettext("Press ENTER to continue.") . " ";
fgets($fp);
echo "\n";
}
$iflist = get_interface_list(); $iflist = get_interface_list();
/* Function flow is based on $key and $auto_assign or the lack thereof */ /* Function flow is based on $key and $auto_assign or the lack thereof */
......
...@@ -49,8 +49,6 @@ $g = array( ...@@ -49,8 +49,6 @@ $g = array(
"product_copyright_years" => "2014 - 2015", "product_copyright_years" => "2014 - 2015",
"product_copyright_url" => "https://www.deciso.com/", "product_copyright_url" => "https://www.deciso.com/",
"latest_config" => "11.1", "latest_config" => "11.1",
"minimum_ram_warning" => "101",
"minimum_ram_warning_text" => "128 MB",
"wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|iwi|wlan|rum|run|bwn|zyd|mwl|bwi|ipw|iwn|malo|uath|upgt|urtw|wpi)/", "wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|iwi|wlan|rum|run|bwn|zyd|mwl|bwi|ipw|iwn|malo|uath|upgt|urtw|wpi)/",
); );
......
...@@ -113,11 +113,6 @@ require_once("rrd.inc"); ...@@ -113,11 +113,6 @@ require_once("rrd.inc");
echo "."; echo ".";
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
echo "."; echo ".";
/* get system memory amount */
$memory = get_memory();
$physmem = $memory[0];
$realmem = $memory[1];
echo " done.\n"; echo " done.\n";
/* save dmesg output to file */ /* save dmesg output to file */
...@@ -245,14 +240,8 @@ echo "Synchronizing user settings..."; ...@@ -245,14 +240,8 @@ echo "Synchronizing user settings...";
local_sync_accounts(); local_sync_accounts();
echo "done.\n"; echo "done.\n";
if($realmem > 0 and $realmem < 65) { /* start web server */
echo "System has less than 65 megabytes of ram {$realmem}. Delaying webConfigurator startup.\n"; system_webgui_start();
/* start webConfigurator up on final pass */
send_event('service restart webgui');
} else {
/* start web server */
system_webgui_start();
}
/* configure cron service */ /* configure cron service */
echo "Configuring CRON..."; echo "Configuring CRON...";
...@@ -329,15 +318,6 @@ enable_rrd_graphing(); ...@@ -329,15 +318,6 @@ enable_rrd_graphing();
/* enable watchdog if supported */ /* enable watchdog if supported */
enable_watchdog(); enable_watchdog();
if($physmem < $g['minimum_ram_warning']) {
require_once("notices.inc");
file_notice("{$g['product_name']}MemoryRequirements", "{$g['product_name']} requires at least {$g['minimum_ram_warning_text']} of RAM. Expect unusual performance. This platform is not supported.", "Memory", "", 1);
set_sysctl(array(
"net.inet.tcp.recvspace" => "4096",
"net.inet.tcp.sendspace" => "4096"
));
}
/* if we are operating at 1000 then increase timeouts. /* if we are operating at 1000 then increase timeouts.
this was never accounted for after moving to 1000 hz */ this was never accounted for after moving to 1000 hz */
$kern_hz = get_single_sysctl('kern.clockrate'); $kern_hz = get_single_sysctl('kern.clockrate');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment