Commit 6fa41b8c authored by Franco Fichtner's avatar Franco Fichtner

crash reporter: two issues (one really, undo a fix that did not work)

parent 6d576045
...@@ -394,16 +394,13 @@ function filter_generate_scrubing() { ...@@ -394,16 +394,13 @@ function filter_generate_scrubing() {
} }
/* set up MSS clamping */ /* set up MSS clamping */
if (isset($scrubcfg['if'])) { $mssclamp = '';
if ( if (
$scrubcfg['mss'] != '' && is_numeric($scrubcfg['mss']) && $scrubcfg['mss'] != '' && is_numeric($scrubcfg['mss']) &&
$scrubcfg['if'] != 'pppoe' && $scrubcfg['if'] != 'pptp' && $scrubcfg['if'] != 'pppoe' && $scrubcfg['if'] != 'pptp' &&
$scrubcfg['if'] != 'l2tp' $scrubcfg['if'] != 'l2tp'
) { ) {
$mssclamp = "max-mss " . (intval($scrubcfg['mss'] - 40)); $mssclamp = "max-mss " . (intval($scrubcfg['mss'] - 40));
} else {
$mssclamp = '';
}
} }
/* configure no-df for linux nfs and others */ /* configure no-df for linux nfs and others */
......
...@@ -351,7 +351,7 @@ function setup_serial_port($when = 'save', $path = '') ...@@ -351,7 +351,7 @@ function setup_serial_port($when = 'save', $path = '')
/* serial console - write out /boot/loader.conf */ /* serial console - write out /boot/loader.conf */
if ($when == "upgrade") if ($when == "upgrade")
system("echo \"Reading {$loader_conf_file}...\" >> /conf/upgrade_log.txt"); system("echo \"Reading {$loader_conf_file}...\" >> /conf/upgrade_log.txt");
$boot_config = file_get_contents($loader_conf_file); $boot_config = @file_get_contents($loader_conf_file);
$boot_config_split = explode("\n", $boot_config); $boot_config_split = explode("\n", $boot_config);
if(count($boot_config_split) > 0) { if(count($boot_config_split) > 0) {
$new_boot_config = array(); $new_boot_config = array();
......
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