diff options
author | Renato Botelho <renato@netgate.com> | 2016-05-02 13:44:13 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-05-02 13:44:31 -0300 |
commit | 1c006228ffa8110cd1c55a3dda417bc2c5ad4033 (patch) | |
tree | b56a5e22392201dfed06f2f7e7a3b2905e197099 /src/usr/local/sbin | |
parent | 053324be6306f13f0477b7950bf428737685f0ee (diff) | |
download | pfsense-1c006228ffa8110cd1c55a3dda417bc2c5ad4033.zip pfsense-1c006228ffa8110cd1c55a3dda417bc2c5ad4033.tar.gz |
Reboot after upgrade when meta package version changed
Diffstat (limited to 'src/usr/local/sbin')
-rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index bc36d32..59ef1fd 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -332,6 +332,7 @@ pkg_upgrade() { _exit 0 fi + local _meta_pkg=$(get_meta_pkg_name) if [ $(pkg upgrade -r ${product}-core -nq | wc -l) -gt 1 ]; then if [ "${platform}" = "nanobsd" ]; then _echo "**** WARNING ****" @@ -355,6 +356,8 @@ pkg_upgrade() { setup_nanobsd_env fi need_reboot=1 + elif pkg upgrade -r ${product} -nq ${_meta_pkg} >/dev/null 2>&1; then + need_reboot=1 fi pkg_unlock ${kernel_pkg} @@ -469,16 +472,20 @@ pkg_upgrade() { fi } -check_upgrade() { +get_meta_pkg_name() { # figure out main meta package name if is_pkg_installed ${product}-vmware; then - local _meta_pkg="${product}-vmware" + echo "${product}-vmware" elif is_pkg_installed ${product}; then - local _meta_pkg="${product}" + echo "${product}" else _echo "ERROR: It was not possible to identify which ${product} meta package is installed" _exit 1 fi +} + +check_upgrade() { + local _meta_pkg=$(get_meta_pkg_name) pkg_update |