summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-04-19 23:15:38 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-04-19 23:15:38 +0000
commit48012bc26fb3b8c91229901c974f7baf5d2ba924 (patch)
tree7da0ee0b2aa336bc708d2b13808dc2adb1a0630d
parentb5b5486cbd3aebc76f40b64680906e714fffe514 (diff)
downloadpfsense-48012bc26fb3b8c91229901c974f7baf5d2ba924.zip
pfsense-48012bc26fb3b8c91229901c974f7baf5d2ba924.tar.gz
Use the new download system in pfSense to download the old style updates.
-rwxr-xr-xetc/rc.firmware_auto8
-rwxr-xr-xusr/local/www/system_firmware_auto.php4
2 files changed, 8 insertions, 4 deletions
diff --git a/etc/rc.firmware_auto b/etc/rc.firmware_auto
index 6f5a5e8..6ead7de 100755
--- a/etc/rc.firmware_auto
+++ b/etc/rc.firmware_auto
@@ -18,10 +18,10 @@ if [ $# -gt 3 ]; then
HTTP_AUTH="basic:*:$3:$4"
fi
-echo "Downloading $FMFILENAME from $FMBASEURL ..." | logger -p daemon.info -i -t AutoUpgrade
-/usr/bin/fetch -o /tmp/latest.tgz $FETCHFILENAME | logger -p daemon.info -i -t AutoUpgrade
-echo "Downloading $FMFILENAME.md5 from $FMBASEURL ..." | logger -p daemon.info -i -t AutoUpgrade
-/usr/bin/fetch -o /tmp/latest.tgz.md5 $FETCHFILENAME.md5 | logger -p daemon.info -i -t AutoUpgrade
+#echo "Downloading $FMFILENAME from $FMBASEURL ..." | logger -p daemon.info -i -t AutoUpgrade
+#/usr/bin/fetch -o /tmp/latest.tgz $FETCHFILENAME | logger -p daemon.info -i -t AutoUpgrade
+#echo "Downloading $FMFILENAME.md5 from $FMBASEURL ..." | logger -p daemon.info -i -t AutoUpgrade
+#/usr/bin/fetch -o /tmp/latest.tgz.md5 $FETCHFILENAME.md5 | logger -p daemon.info -i -t AutoUpgrade
PMD=`/bin/cat /tmp/latest.tgz.md5 | cut -d" " -f4 `;
MD=`/sbin/md5 /tmp/latest.tgz | cut -d" " -f4`;
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php
index 4e11e4a..d1ce27e 100755
--- a/usr/local/www/system_firmware_auto.php
+++ b/usr/local/www/system_firmware_auto.php
@@ -229,6 +229,10 @@ if($use_old_checkversion == false) {
exit;
} else {
touch("/tmp/auto_upgrade_in_progress");
+ log_error("Downloading http://www.pfSense.com/latest.tgz");
+ download_file_with_progress_bar("http://www.pfSense.com/latest.tgz", "/tmp/latest.tgz");
+ log_error("Downloading http://www.pfSense.com/latest.tgz");
+ download_file_with_progress_bar("http://www.pfSense.com/latest.tgz.md5", "/tmp/latest.tgz.md5");
mwexec_bg("/etc/rc.firmware_auto \"{$firmwareurl}\" \"{$firmwarename}\" \"{$http_auth_username}\" \"{$http_auth_password}\"");
$update_status = "pfSense is now auto upgrading. The firewall will automatically reboot if it succeeds.";
update_status("pfSense is now upgrading. The firewall will reboot once the operation has completed.");
OpenPOWER on IntegriCloud