diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-06-24 14:20:47 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-06-24 14:20:47 -0400 |
| commit | 6a581b52368e98277ad5c21d9d3398448e267f03 (patch) | |
| tree | 77e491dd922b0f223605bf93a783239c150bfca9 /etc | |
| parent | aaffe23409b01af1ded4e1a309c252184644d681 (diff) | |
| download | pfsense-6a581b52368e98277ad5c21d9d3398448e267f03.zip pfsense-6a581b52368e98277ad5c21d9d3398448e267f03.tar.gz | |
Use updatep1 from /root/
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.firmware | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware index 376e8f9..00be5de 100755 --- a/etc/rc.firmware +++ b/etc/rc.firmware @@ -153,10 +153,6 @@ upgrade) fi ;; pfSenseNanoBSDupgrade) - touch /var/run/firmware.lock - - # wait 1 seconds before beginning - sleep 1 # Sanity check - bail early if there's no firmware file! if [ ! -r $IMG ]; then @@ -164,6 +160,11 @@ pfSenseNanoBSDupgrade) exit fi + # wait 1 seconds before beginning + sleep 1 + + touch /var/run/firmware.lock + # Do we have a pre-upgrade hook in the update file? if [ `tar tvzf $IMG | grep /tmp/pre_upgrade_command | wc -l` -gt 0 ]; then tar xzvf $IMG -C / ./tmp/pre_upgrade_command @@ -183,7 +184,7 @@ pfSenseNanoBSDupgrade) echo "Installing $IMG." | logger -p daemon.info -i -t Upgrade - zcat $IMG | update1 + zcat $IMG | /root/updatep1 # restore config cp -p /tmp/configbak/* /conf 2>/dev/null @@ -222,11 +223,6 @@ pfSenseNanoBSDupgrade) ;; pfSenseupgrade) - - touch /var/run/firmware.lock - - # wait 1 seconds before beginning - sleep 1 # Sanity check - bail early if there's no firmware file! if [ ! -r $IMG ]; then @@ -234,6 +230,11 @@ pfSenseupgrade) exit fi + # wait 1 seconds before beginning + sleep 1 + + touch /var/run/firmware.lock + backup_chflags remove_chflags |
