diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-04-07 03:29:04 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-04-07 03:29:04 +0000 |
| commit | cdb0117c70cf7caeef1f3a82111384c484d6118d (patch) | |
| tree | 35c5a47825f01d71939a2689f31e8199c6c71948 /usr | |
| parent | 1c0e3b998d16c620ce33f61be35da5b9245ba3da (diff) | |
| download | pfsense-cdb0117c70cf7caeef1f3a82111384c484d6118d.zip pfsense-cdb0117c70cf7caeef1f3a82111384c484d6118d.tar.gz | |
Get script ready for colins xmlrpc transformation:
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/system_firmware_auto.php | 19 | ||||
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 3 |
2 files changed, 14 insertions, 8 deletions
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index 98ffa3b..e224290 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -78,19 +78,24 @@ require("guiconfig.inc"); /* auto upgrade logic starts here */ +// XXX: logic to deterimine if we need a new version. +$needs_system_upgrade = true; +$needs_base_upgrade = false; +$platform = return_filename_as_string("/etc/platform"); + +/* colin, these will become xmlrpc */ update_status("Downloading current version information..."); -$status = download_file_with_progress_bar("http://www.pfSense.com/pfSense/version", "/tmp/pfSense_version"); +$system_version_avail = download_file_with_progress_bar("http://www.pfSense.com/pfSense/version", "/tmp/pfSense_version"); update_status("Downloading current base version information..."); -$status = download_file_with_progress_bar("http://www.pfSense.com/pfSense/version_base", "/tmp/pfSense_base_version"); +$base_version_avail = download_file_with_progress_bar("http://www.pfSense.com/pfSense/version_base", "/tmp/pfSense_base_version"); + +update_status("Downloading current kernel version information..."); +$kernel_version_avail = download_file_with_progress_bar("http://www.pfSense.com/pfSense/version_kernel_{$platform}", "/tmp/pfSense_kernel_version"); $current_installed_pfsense_version = return_filename_as_string("/etc/version"); $current_installed_pfsense_base_version = return_filename_as_string("/etc/version_base"); - -// XXX: logic to deterimine if we need a new version. -$needs_system_upgrade = true; -$needs_base_upgrade = false; -$platform = return_filename_as_string("/etc/platform"); +/* end of colin these will be xmlrpc */ if($needs_system_upgrade == true) { update_status("Downloading updates ..."); diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index fb18db3..a2eca96 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -451,7 +451,8 @@ <step> <id>8</id> <title>Reboot in progress</title> - <description>A reboot is now in progress. Please wait. <p> The system will automatically try to access $myurl in 120 seconds. <p> You can click on the icon above to access the site quicker. <meta http-equiv="refresh" content="120; url=$myurl" ></description> + <description>A reboot is now in progress. Please wait. <p> The system will automatically try to access $myurl in 120 seconds. <p> You can click on the icon above to access the site quicker. + <meta http-equiv="refresh" content="120; url=$myurl" ></description> <stepafterformdisplay> system("/sbin/shutdown -r now"); </stepafterformdisplay> |
