diff options
| author | jim-p <jimp@pfsense.org> | 2011-08-03 09:51:46 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-08-03 09:52:29 -0400 |
| commit | dd40d6641db9b1619dcf7abafa2c47b69b456867 (patch) | |
| tree | 43523c14085545daad44c3deed5cb784c9edfb35 /etc | |
| parent | e9df45f07460631a3816e932b68843615a8f682b (diff) | |
| download | pfsense-dd40d6641db9b1619dcf7abafa2c47b69b456867.zip pfsense-dd40d6641db9b1619dcf7abafa2c47b69b456867.tar.gz | |
USB slices are under-reported even more than CF slices when viewed directly, instead of when looking at the entire disk. Compensate by adding a few MB. Fixes NanoBSD upgrades when installed on USB thumbdrives. (Imaged after this fix, someone can apply this fix locally and then upgrade as well.)
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.firmware | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware index 063e9a3..698db67 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -206,7 +206,10 @@ pfSenseNanoBSDupgrade) # slice that we are going to be operating on. NEW_IMG_SIZE=`echo $((\`gzip -l ${IMG} | grep -v compressed | awk '{ print $2}'\` / 1024 / 1024))` SIZE=`/sbin/fdisk ${COMPLETE_PATH} | /usr/bin/grep Meg | /usr/bin/awk '{ print $5 }' | /usr/bin/cut -d"(" -f2` - SIZE=`expr $SIZE + 1` + # USB slices are under-reported even more than CF slices when viewed + # directly, instead of when looking at the entire disk. Compensate + # by adding a few MB. + SIZE=`expr $SIZE + 4` if [ "$SIZE" -lt "$NEW_IMG_SIZE" ]; then file_notice "UpgradeFailure" "Upgrade failed due to the upgrade image being larger than the partition that is configured on disk. Halting. Size on disk: $SIZE < Size of new image: $NEW_IMG_SIZE" echo "Upgrade failed. Please check the system log file for more information" | wall |
