From 096c514733ebbcd254bf428d807e1e10160f80e0 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 25 Sep 2015 09:26:29 -0300 Subject: Relocate global variables definitions, no functional changes --- src/usr/local/sbin/pfSense-upgrade | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/usr/local/sbin') diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index f979c63..41afb66 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -269,6 +269,10 @@ upgrade() { pid_file="/var/run/$(basename $0).pid" last_update_file="/var/run/$(basename $0)-last-update" logfile=/cf/conf/upgrade_log.txt +stdout='/dev/null' + +# File used to detect second call, after kernel update and reboot +upgrade_in_progress="/cf/conf/upgrade_in_progress" # pkg should not ask for confirmations export ASSUME_ALWAYS_YES=true @@ -276,11 +280,6 @@ export ASSUME_ALWAYS_YES=true # Disable automatic update export REPO_AUTOUPDATE=false -# File used to detect second call, after kernel update and reboot -upgrade_in_progress="/cf/conf/upgrade_in_progress" - -stdout='/dev/null' - unset yes action="run_upgrade" while getopts duy opt; do -- cgit v1.1