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:48 -0300 |
commit | a63c65a64714846f042ba790698b96b842e00bc3 (patch) | |
tree | 276aa8c38dc8d96198dc8915d2203fd4d6ecc627 | |
parent | a9ea552fa61252075ae641df12a64cb549e9c65c (diff) | |
download | pfsense-a63c65a64714846f042ba790698b96b842e00bc3.zip pfsense-a63c65a64714846f042ba790698b96b842e00bc3.tar.gz |
Reboot after upgrade when meta package version changed
-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 051c0b8..899bbff 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 |