diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-10-10 01:25:46 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-10-10 01:25:46 +0000 |
commit | 89d6fe70f8da42652b6fec93f35461f9f7b9c647 (patch) | |
tree | 804ddc8cbd5ac33c393908d4f248699914bb48ab /usr/local/www | |
parent | 90f96be3ffca83672b2388f704534bbb24cb2ad7 (diff) | |
download | pfsense-89d6fe70f8da42652b6fec93f35461f9f7b9c647.zip pfsense-89d6fe70f8da42652b6fec93f35461f9f7b9c647.tar.gz |
Convert_config() on next boot
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/diag_backup.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index 922065a..7ae9f0e 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -128,7 +128,6 @@ if ($_POST) { $fd = fopen($_FILES['conffile']['tmp_name'], "w"); fwrite($fd, $upgradedconfig); fclose($fd); - $tmp = $upgradedconfig; $m0n0wall_upgrade = true; } if($_POST['restorearea'] <> "") { @@ -157,15 +156,14 @@ if ($_POST) { if(file_exists("/tmp/config.cache")) unlink("/tmp/config.cache"); if($m0n0wall_upgrade == true) { - parse_config(false); - /* force a configuration upgrade */ - convert_config(); + parse_config(true); if($config['system']['gateway'] <> "") { $config['interfaces']['wan']['gateway'] = $config['system']['gateway']; } unset($config['shaper']); write_config(); conf_mount_ro(); + $savemsg = "The m0n0wall configuration has been restored and upgraded to pfSense.<p>The firewall is now rebooting."; } } else { $input_errors[] = "The configuration could not be restored."; |