diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-03-26 20:23:27 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-03-26 20:23:27 +0000 |
| commit | 02e1170d67f5e2d3a4aa531ba900fc954cecf20d (patch) | |
| tree | 045863cb0752b685d076e843d36d530044355a08 | |
| parent | 780dbd568256979a68c982ddde7740c2ea3a3751 (diff) | |
| download | pfsense-02e1170d67f5e2d3a4aa531ba900fc954cecf20d.zip pfsense-02e1170d67f5e2d3a4aa531ba900fc954cecf20d.tar.gz | |
Mount flash r/w to remove /usr/local/www/trigger_initial_wizard
| -rwxr-xr-x | usr/local/www/diag_backup.php | 7 | ||||
| -rwxr-xr-x | usr/local/www/index.php | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index 57e5eb7..245b9f3 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -194,6 +194,11 @@ if (isset($config['system']['version_control'])) { } } +$id = rand() . '.' . time(); + +$mth = ini_get('upload_progress_meter.store_method'); +$dir = ini_get('upload_progress_meter.file.filename_template'); + ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> @@ -206,7 +211,7 @@ if (isset($config['system']['version_control'])) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> <p class="pgtitle">Diagnostics: Backup/restore</p> - <form action="diag_backup.php" method="post" enctype="multipart/form-data"> + <form action="diag_backup.php" method="post" enctype="multipart/form-data" onSubmit="window.open('progress.php?conffile=<?=$id?>','UploadMeter','width=370,height=115', true); return true; "> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <table width="100%" border="0" cellspacing="0" cellpadding="6"> diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 5321526..87c1a5c 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -32,13 +32,16 @@ */ if(file_exists("/usr/local/www/trigger_initial_wizard")) { + conf_mount_rw(); unlink("/usr/local/www/trigger_initial_wizard"); + conf_mount_ro(); echo "<center>"; echo "Welcome to pfSense!<p>"; echo "One moment while we start the initial setup wizard.<p>"; echo "Embedded platform users: Please be patient, the wizard takes a little longer to run than the normal gui.<p>"; echo "To bypass the wizard, click on the pfSense wizard on the initial page."; echo "<meta http-equiv=\"refresh\" content=\"1;url=wizard.php?xml=setup_wizard.xml\">"; + exit; } require("guiconfig.inc"); |
