summaryrefslogtreecommitdiffstats
path: root/src/usr/local
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-11 15:28:34 -0300
committerRenato Botelho <renato@netgate.com>2015-09-11 15:28:34 -0300
commitff80cd609ec6ca8aff325db14890f50eeca9fc8f (patch)
tree3e6d46770a30f3d998bd723b8cc62a7ecddc93a1 /src/usr/local
parentce7afe661b4d1eb1ba8e09a1c5563d77ab0b6d5b (diff)
downloadpfsense-ff80cd609ec6ca8aff325db14890f50eeca9fc8f.zip
pfsense-ff80cd609ec6ca8aff325db14890f50eeca9fc8f.tar.gz
Do not reset logfile on second call of upgrade script
Diffstat (limited to 'src/usr/local')
-rwxr-xr-xsrc/usr/local/sbin/pfsense-upgrade.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/usr/local/sbin/pfsense-upgrade.sh b/src/usr/local/sbin/pfsense-upgrade.sh
index a6f7bf0..7573234 100755
--- a/src/usr/local/sbin/pfsense-upgrade.sh
+++ b/src/usr/local/sbin/pfsense-upgrade.sh
@@ -46,12 +46,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
# OF THE POSSIBILITY OF SUCH DAMAGE.
-logfile=/cf/conf/upgrade_log.txt
-
-if [ -f "${logfile}" ]; then
- rm -f ${logfile}
-fi
-
# pkg should not ask for confirmations
export ASSUME_ALWAYS_YES=true
@@ -246,8 +240,14 @@ second_step() {
rm -f ${firmwarelock}
}
+logfile=/cf/conf/upgrade_log.txt
+
unset need_reboot
if [ ! -f "${upgrade_in_progress}" ]; then
+ if [ -f "${logfile}" ]; then
+ rm -f ${logfile}
+ fi
+
first_step
need_reboot=1
fi
OpenPOWER on IntegriCloud