summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-02-04 08:03:00 +0545
committerRenato Botelho <garga@FreeBSD.org>2015-02-04 16:22:29 -0200
commita912dd7d0bf4bbac67d61d95c117663008c3dba0 (patch)
tree782fe99ab6dd15e29cd518799a004ce8d04f7273
parent01f3438e7ab91d29751fc27a4627a98c8cba2b4b (diff)
downloadpfsense-a912dd7d0bf4bbac67d61d95c117663008c3dba0.zip
pfsense-a912dd7d0bf4bbac67d61d95c117663008c3dba0.tar.gz
Firmware upgrade script text changes
while I am looking at this, might as well correct these. No function problems or impact.
-rwxr-xr-xetc/rc.firmware20
1 files changed, 10 insertions, 10 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware
index db886b2..3912291 100755
--- a/etc/rc.firmware
+++ b/etc/rc.firmware
@@ -145,8 +145,8 @@ pfSenseNanoBSDupgrade)
# Prevent full upgrade file from being used to upgrade
if [ `echo $IMG | grep "full"` ]; then
- echo "You cannot use a full file for upgrade. Please use a file labeled nanobsd upgrade."
- file_notice "NanoBSDUpgradeFailure" "You have attemped to use a full NanoBSD installation file as an upgrade. Please use a NanoBSD file labeled 'upgrade' instead."
+ echo "You cannot use a full file for upgrade. Please use a file labelled nanobsd upgrade."
+ file_notice "NanoBSDUpgradeFailure" "You have attempted to use a full NanoBSD installation file as an upgrade. Please use a NanoBSD file labelled 'upgrade' instead."
rm -f $IMG
/etc/rc.conf_mount_ro
exit 1
@@ -176,7 +176,7 @@ pfSenseNanoBSDupgrade)
REAL_BOOT_DEVICE=`/sbin/glabel list | /usr/bin/grep -B2 ufs/${BOOT_DEVICE} | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' '`
# grab the boot device, example ad1, ad0
BOOT_DRIVE=`/sbin/glabel list | /usr/bin/grep -B2 ufs/pfsense | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' ' | /usr/bin/cut -d's' -f1`
- # test the slice. if we are on slice 1 we need to flash 2 and vica versa
+ # test the slice. if we are on slice 1 we need to flash 2 and vice versa
if [ `echo $REAL_BOOT_DEVICE | /usr/bin/grep "s1"` ]; then
SLICE="2"
OLDSLICE="1"
@@ -195,7 +195,7 @@ pfSenseNanoBSDupgrade)
OLD_UFS_ID="1"
fi
- # Output specifc information that this script is using
+ # Output specific information that this script is using
echo "SLICE ${SLICE}" >> /conf/upgrade_log.txt
echo "OLDSLICE ${OLDSLICE}" >> /conf/upgrade_log.txt
echo "TOFLASH ${TOFLASH}" >> /conf/upgrade_log.txt
@@ -207,9 +207,9 @@ pfSenseNanoBSDupgrade)
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`
# USB slices are under-reported even more than CF slices when viewed
- # directly, instead of when looking at the entire disk. Compensate
- # by adding exactly 6MB. 4MB was consistently 2MB too few, and
- # was resulting in failing upgrades on USB Flash based installs.
+ # directly, instead of when looking at the entire disk. Compensate
+ # by adding exactly 6MB. 4MB was consistently 2MB too few, and
+ # was resulting in failing upgrades on USB Flash based installs.
SIZE=`expr $SIZE + 6`
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"
@@ -250,7 +250,7 @@ pfSenseNanoBSDupgrade)
echo "/usr/bin/gzip -dc $IMG | /bin/dd of=/dev/${TOFLASH} obs=64k" >> /conf/upgrade_log.txt
/usr/bin/gzip -dc $IMG | /bin/dd of=/dev/${TOFLASH} obs=64k >> /conf/upgrade_log.txt 2>&1
- # Grab a after upgrade look at fdisk
+ # Grab an after upgrade look at fdisk
echo "" >> /conf/fdisk_upgrade_log.txt
echo "After upgrade fdisk/bsdlabel" >> /conf/upgrade_log.txt
fdisk $BOOT_DRIVE >> /conf/fdisk_upgrade_log.txt
@@ -364,7 +364,7 @@ pfSenseNanoBSDupgrade)
date >> /conf/upgrade_log.txt
echo "" >> /conf/upgrade_log.txt
- # Trigger a package reinstallation on reobot
+ # Trigger a package reinstallation on reboot
touch /conf/needs_package_sync
# remount /cf ro
@@ -391,7 +391,7 @@ pfSenseupgrade)
exit
fi
- # wait 1 seconds before beginning
+ # wait 1 second before beginning
sleep 1
# Log that we are really doing a pfSense upgrade
OpenPOWER on IntegriCloud