From cdb0117c70cf7caeef1f3a82111384c484d6118d Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Thu, 7 Apr 2005 03:29:04 +0000 Subject: Get script ready for colins xmlrpc transformation: --- usr/local/www/system_firmware_auto.php | 19 ++++++++++++------- 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 @@ 8 Reboot in progress - 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" > + 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" > system("/sbin/shutdown -r now"); -- cgit v1.1