diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-12 17:10:29 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-12 17:10:29 -0300 |
commit | 0d7715eb82e1efa1afeb998729316e917f73708b (patch) | |
tree | 89aea7f35fb7f7d8ab67ae9abcf4c6abfc38d41f | |
parent | 739c78ac308506dc00a9a5cd95f70e277cfba280 (diff) | |
download | pfsense-0d7715eb82e1efa1afeb998729316e917f73708b.zip pfsense-0d7715eb82e1efa1afeb998729316e917f73708b.tar.gz |
Detect if nanobsd or nanobsd-vga image must be used for upgrade
-rwxr-xr-x | usr/local/www/system_firmware_auto.php | 7 | ||||
-rwxr-xr-x | usr/local/www/system_firmware_check.php | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index 48d727c..4f655fe 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -126,7 +126,12 @@ include("head.inc"); update_status(gettext("Downloading current version information") . "..."); $nanosize = ""; if ($g['platform'] == "nanobsd") { - $nanosize = "-nanobsd-" . strtolower(trim(file_get_contents("/etc/nanosize.txt"))); + if (file_exists("/etc/nano_use_vga.txt")) + $nanosize = "-nanobsd-vga-"; + else + $nanosize = "-nanobsd-"; + + $nanosize .= strtolower(trim(file_get_contents("/etc/nanosize.txt"))); } download_file_with_progress_bar("{$updater_url}/version{$nanosize}", "/tmp/{$g['product_name']}_version"); diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php index c676950..8057a3c 100755 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -123,7 +123,12 @@ $static_text .= gettext("Downloading new version information..."); $nanosize = ""; if ($g['platform'] == "nanobsd") { - $nanosize = "-nanobsd-" . strtolower(trim(file_get_contents("/etc/nanosize.txt"))); + if (file_exists("/etc/nano_use_vga.txt")) + $nanosize = "-nanobsd-vga-"; + else + $nanosize = "-nanobsd-"; + + $nanosize .= strtolower(trim(file_get_contents("/etc/nanosize.txt"))); } download_file_with_progress_bar("{$updater_url}/version{$nanosize}", "/tmp/{$g['product_name']}_version"); |