diff options
author | Renato Botelho <garga@FreeBSD.org> | 2015-03-11 19:14:16 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2015-03-11 19:14:16 -0300 |
commit | 02acc7afdf137d2da969f120e7318584e58c7993 (patch) | |
tree | ab4bd109177a51a98a5d7bbccc90066e2f420bed /tmp | |
parent | 830ceadf0225bfcd0a2c98fb8091e7deefa6dc8a (diff) | |
download | pfsense-02acc7afdf137d2da969f120e7318584e58c7993.zip pfsense-02acc7afdf137d2da969f120e7318584e58c7993.tar.gz |
Detect when broken rc.firmware is running, fix it and restart. This should fix #4328
Diffstat (limited to 'tmp')
-rw-r--r-- | tmp/pre_upgrade_command | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tmp/pre_upgrade_command b/tmp/pre_upgrade_command index d146187..2bcdfb2 100644 --- a/tmp/pre_upgrade_command +++ b/tmp/pre_upgrade_command @@ -21,6 +21,27 @@ if [ "${PRIOR_VERSION}" = "8" ] && grep -q 'sh /etc/rc.reboot' /etc/rc.firmware; kill ${PID} >/dev/null 2>&1 kill -9 ${PID} >/dev/null 2>&1 sed -i '' -e 's,sh /,/tmp/sh.old /,' /etc/rc.firmware + # To avoid restarting rc.firmware twice because of #4328 + sed -i '' -e '/^restore_chflags()/, /^}/ s/mtree *-PU/mtree -P/' /etc/rc.firmware + /etc/rc.firmware pfSenseupgrade "${IMG}" + exit + fi +fi + +# One more hack to workaround #4328 +if grep -q 'mtree *-PU' /etc/rc.firmware; then + PROC=$(ps axwww | grep '/etc/rc.firmware *pfSenseupgrade') + PID='' + IMG='' + if [ -n "${PROC}" ]; then + PID=$(echo "${PROC}" | awk '{print $1}') + IMG=$(echo "${PROC}" | sed 's,^.*pfSenseupgrade *,,') + fi + + if [ -n "${PID}" -a -n "${IMG}" -a -f "${IMG}" ]; then + kill ${PID} >/dev/null 2>&1 + kill -9 ${PID} >/dev/null 2>&1 + sed -i '' -e '/^restore_chflags()/, /^}/ s/mtree *-PU/mtree -P/' /etc/rc.firmware /etc/rc.firmware pfSenseupgrade "${IMG}" exit fi |