diff options
| -rw-r--r-- | etc/inc/globals.inc | 4 | ||||
| -rwxr-xr-x | etc/rc.firmware_auto | 17 | ||||
| -rwxr-xr-x | usr/local/www/system_firmware.php | 7 |
3 files changed, 19 insertions, 9 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 42a03d9..f6d2a63 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -52,7 +52,9 @@ $g = array( "debug" => false, "latest_config" => "1.5", "nopccard_platforms" => array("wrap", "net48xx"), - "pkg_config_location" => "http://www.pfsense.com/packages/pkg_config.xml" + "pkg_config_location" => "http://www.pfsense.com/packages/pkg_config.xml", + "firmwarebaseurl" => "http://www.pfsense.com/", + "firmwarefilename" => "latest.tgz" ); ?> diff --git a/etc/rc.firmware_auto b/etc/rc.firmware_auto index 113fe8e..2bc347c 100755 --- a/etc/rc.firmware_auto +++ b/etc/rc.firmware_auto @@ -1,5 +1,8 @@ #!/bin/sh +FMBASEURL=$1 +FMFILENAME=$2 + # wait 5 seconds before beginning sleep 5 @@ -8,16 +11,16 @@ logger -p daemon.info -i -t AutoUpgrade "Auto Upgrade started" HTTP_AUTH="" # if username and password is passed, let fetch utilize. -if [ $# -gt 1 ]; then -HTTP_AUTH="basic:*:$1:$2" +if [ $# -gt 3 ]; then +HTTP_AUTH="basic:*:$3:$4" fi -echo "Downloading latest.tgz ..." | logger -p daemon.info -i -t AutoUpgrade -cd /tmp && fetch http://www.pfSense.com/latest.tgz | logger -p daemon.info -i -t AutoUpgrade -echo "Downloading latest.tgz.md5 ..." | logger -p daemon.info -i -t AutoUpgrade -cd /tmp && fetch http://www.pfSense.com/latest.tgz.md5 | logger -p daemon.info -i -t AutoUpgrade +echo "Downloading ${FMFILENAME} from ${FMBASEURL} ..." | logger -p daemon.info -i -t AutoUpgrade +/usr/bin/fetch ${FMBASEURL}/${FMFILENAME} -o /tmp/latest.tgz | logger -p daemon.info -i -t AutoUpgrade +echo "Downloading ${FMFILENAME}.md5 from ${FMBASEURL} ..." | logger -p daemon.info -i -t AutoUpgrade +/usr/bin/fetch ${FMBASEURL}/${FMFILENAME}.md5 -o /tmp/latest.tgz.md5 | logger -p daemon.info -i -t AutoUpgrade -PMD=`cat /tmp/latest.tgz.md5 | cut -d" " -f4 `; +PMD=`/bin/cat /tmp/latest.tgz.md5 | cut -d" " -f4 `; MD=`/sbin/md5 /tmp/latest.tgz | cut -d" " -f4`; echo " Package MD5: ${PMD}" | logger -p daemon.info -i -t AutoUpgrade diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index f51d7f8..f6326dd 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -81,7 +81,12 @@ if($_POST) { $http_auth_username = $config['system']['proxy_auth_username']; if($config['system']['proxy_auth_password']) $http_auth_password = $config['system']['proxy_auth_password']; - exec_rc_script_async("/etc/rc.firmware_auto {$http_auth_username} {$http_auth_password}"); + + /* stub in custom firmware option */ + $firmwareurl=$g['firmwarebaseurl']; + $firmwarename=$g['firmwarefilename']; + + exec_rc_script_async("/etc/rc.firmware_auto {$firmwareurl} {$firmwarename} {$http_auth_username} {$http_auth_password}"); $savemsg = "pfSense is now auto upgrading. The firewall will automatically reboot if it succeeds."; } } |
