diff options
| author | Scott Ullrich <sullrich@su.local> | 2009-09-10 18:35:12 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@su.local> | 2009-09-10 18:35:12 -0400 |
| commit | 7335c4cf606a854af2c6d45f10eb7695bedb35d7 (patch) | |
| tree | f7bfeffddfc9ac0f4c9be940b7a1e9c33f954195 /etc/rc.firmware | |
| parent | 5d15e968791c5d1ae538080bdb61a674b9051c7f (diff) | |
| download | pfsense-7335c4cf606a854af2c6d45f10eb7695bedb35d7.zip pfsense-7335c4cf606a854af2c6d45f10eb7695bedb35d7.tar.gz | |
Remove /var/run/firmware.lock as well
Diffstat (limited to 'etc/rc.firmware')
| -rwxr-xr-x | etc/rc.firmware | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware index d391e46..18b794b 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -200,7 +200,8 @@ pfSenseNanoBSDupgrade) 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 - rm /var/run/firmwarelock.dirty + rm -f /var/run/firmwarelock.dirty + rm -f /var/run/firmware.lock /etc/rc.conf_mount_ro exit 1 fi @@ -259,7 +260,8 @@ pfSenseNanoBSDupgrade) /sbin/fsck_ufs -y /dev/$COMPLETE_PATH >> /conf/upgrade_log.txt 2>&1 if [ $? != 0 ]; then file_notice "UpgradeFailure" "{\$g['product_name']} upgrade has failed. Your system has been left in a usable state." - rm /var/run/firmwarelock.dirty + rm -f /var/run/firmwarelock.dirty + rm -f /var/run/firmware.lock /etc/rc.conf_mount_ro exit 1 fi @@ -294,7 +296,8 @@ pfSenseNanoBSDupgrade) if [ $? != 0 ]; then echo "Something went wrong when trying to update the fstab entry. Aborting upgrade." file_notice "UpgradeFailure" "Something went wrong when trying to update the fstab entry. Aborting upgrade." - rm /var/run/firmwarelock.dirty + rm -f /var/run/firmwarelock.dirty + rm -f /var/run/firmware.lock umount /tmp/$GLABEL_SLICE /etc/rc.conf_mount_ro exit 1 @@ -360,6 +363,7 @@ pfSenseNanoBSDupgrade) sleep 10 rm -f /var/run/firmwarelock.dirty + rm -f /var/run/firmware.lock sh /etc/rc.reboot ;; @@ -458,6 +462,7 @@ pfSenseupgrade) # release the firmware lock rm -f /var/run/firmwarelock.dirty + rm -f /var/run/firmware.lock /bin/sync # Sleep and allow disks to catch up |
