diff options
author | Renato Botelho <renato@netgate.com> | 2015-09-25 09:26:29 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-09-25 09:26:29 -0300 |
commit | 096c514733ebbcd254bf428d807e1e10160f80e0 (patch) | |
tree | 5ea080b40cd34b1c59d6a47e80b7a1b0446b8a9c /src/usr/local | |
parent | 23ee0868b4c6f759ab98d25fe637149e7ff7256a (diff) | |
download | pfsense-096c514733ebbcd254bf428d807e1e10160f80e0.zip pfsense-096c514733ebbcd254bf428d807e1e10160f80e0.tar.gz |
Relocate global variables definitions, no functional changes
Diffstat (limited to 'src/usr/local')
-rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 9 |
1 files changed, 4 insertions, 5 deletions
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 |