summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-07-10 08:44:42 -0300
committerRenato Botelho <garga@FreeBSD.org>2014-07-11 08:23:04 -0300
commit00aa34f15405413ccca21707d797a6918c870cdb (patch)
tree4a6a9797330696fbb30d5ed80277bcd3a7b4f795
parent375fce94f5c8efa9fb21715abb3b52af8d1d6be0 (diff)
downloadpfsense-00aa34f15405413ccca21707d797a6918c870cdb.zip
pfsense-00aa34f15405413ccca21707d797a6918c870cdb.tar.gz
In some cases, new /bin/sh binary doesn't work properly before reboot during a upgrade, and because of that /etc/rc.reboot is not executed and system doesn't reboot. Source /etc/rc.reboot instead of open a new sh session to avoid it happening again in future versions (ticket #3749)
-rwxr-xr-xetc/rc.firmware4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware
index aa3d992..7d183b8 100755
--- a/etc/rc.firmware
+++ b/etc/rc.firmware
@@ -379,7 +379,7 @@ pfSenseNanoBSDupgrade)
rm -f /var/run/firmwarelock.dirty
rm -f /var/run/firmware.lock
- sh /etc/rc.reboot
+ . /etc/rc.reboot
;;
pfSenseupgrade)
@@ -509,7 +509,7 @@ pfSenseupgrade)
if [ -f /tmp/no_upgrade_reboot_required ]; then
rm /tmp/no_upgrade_reboot_required
else
- sh /etc/rc.reboot
+ . /etc/rc.reboot
fi
;;
OpenPOWER on IntegriCloud