diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-06-30 17:11:30 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-06-30 17:15:22 +0000 |
| commit | a368a026db2e79ef7c48f5db0fbff27da5468c26 (patch) | |
| tree | 0b68b80cafa3f8cc310d8deaaa8a8fbd2e2f0482 /etc/rc.firmware | |
| parent | 6819b7f60c841f89e415d6547e2e776cf1a47c5e (diff) | |
| download | pfsense-a368a026db2e79ef7c48f5db0fbff27da5468c26.zip pfsense-a368a026db2e79ef7c48f5db0fbff27da5468c26.tar.gz | |
* Reorganize the 'apply' button infrustructure in the GUI.
- Present three new functions is/mark/clear_subsystem_dirty('name_of_subsystem'). This makes easier to create such things without needing to introduce new globals.
- Convert all pages to the new infrustructure
- This improves a lot the control on this notification
Diffstat (limited to 'etc/rc.firmware')
| -rwxr-xr-x | etc/rc.firmware | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware index 7d31383..f9e817d 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -117,7 +117,7 @@ enable) echo "" > /cf/upgrade_log.txt ;; auto) - touch /var/run/firmware.lock + touch /var/run/firmwarelock.dirty backup_chflags remove_chflags /etc/rc.firmware_auto @@ -140,7 +140,7 @@ pfSenseNanoBSDupgrade) exit 1 fi - touch /var/run/firmware.lock + touch /var/run/firmwarelock.dirty echo "NanoBSD Firmware upgrade in progress..." >> /cf/upgrade_log.txt 2>&1 echo "NanoBSD Firmware upgrade in progress..." | wall @@ -216,7 +216,7 @@ pfSenseNanoBSDupgrade) /sbin/fsck_ffs -y /dev/$COMPLETE_PATH >> /cf/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/firmware.lock + rm /var/run/firmwarelock.dirty /etc/rc.conf_mount_ro exit 1 fi @@ -248,7 +248,7 @@ 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/firmware.lock + rm /var/run/firmwarelock.dirty umount /tmp/$GLABEL_SLICE /etc/rc.conf_mount_ro exit 1 @@ -290,7 +290,7 @@ pfSenseNanoBSDupgrade) echo "/sbin/sysctl kern.geom.debugflags=0" >> /cf/upgrade_log.txt /sbin/sysctl kern.geom.debugflags=0 >> /cf/upgrade_log.txt 2>&1 - rm -f /var/run/firmware.lock + rm -f /var/run/firmwarelock.dirty sh /etc/rc.reboot ;; @@ -311,7 +311,7 @@ pfSenseupgrade) echo "NanoBSD upgrade starting" >> /cf/upgrade_log.txt echo "" >> /cf/upgrade_log.txt - touch /var/run/firmware.lock + touch /var/run/firmwarelock.dirty touch /cf/upgrade_log.txt echo "" >> /cf/upgrade_log.txt @@ -388,7 +388,7 @@ pfSenseupgrade) /etc/rc.conf_mount_ro # release the firmware lock - rm -f /var/run/firmware.lock + rm -f /var/run/firmwarelock.dirty /bin/sync # If the archive has unpacked a file called @@ -403,7 +403,7 @@ pfSenseupgrade) ;; delta_update) - touch /var/run/firmware.lock + touch /var/run/firmwarelock.dirty backup_chflags remove_chflags binary_update $IMG |
