summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-04-06 07:28:48 -0300
committerRenato Botelho <renato@netgate.com>2016-04-06 07:29:02 -0300
commit751815fe823d150e5a574db9dfb00f98d6c08dc5 (patch)
treec282d50e94e95369d1aa347bdb49dec15dd58138
parentc819492263c75791d2d79329403cbd1b9e009b47 (diff)
downloadpfsense-751815fe823d150e5a574db9dfb00f98d6c08dc5.zip
pfsense-751815fe823d150e5a574db9dfb00f98d6c08dc5.tar.gz
Silence /etc/rc.notify_message garbage output
(cherry picked from commit eb3491d99e939ab21d84122ededf9e7e9462ed71)
-rwxr-xr-xsrc/usr/local/sbin/pfSense-upgrade5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index a995273..051c0b8 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -692,12 +692,13 @@ do_reboot() {
if [ -z "${dont_reboot}" ]; then
_echo "Upgrade is complete. Rebooting in ${reboot_after} seconds."
echo "Upgrade is complete. Rebooting in ${reboot_after} seconds." | wall
- /etc/rc.notify_message -e -g -m "Upgrade is complete. Rebooting in ${reboot_after} seconds."
+ /etc/rc.notify_message -e -g -m "Upgrade is complete. Rebooting in ${reboot_after} seconds." \
+ >/dev/null 2>&1
(sleep ${reboot_after} && /etc/rc.reboot) &
else
_echo "Upgrade is complete."
echo "Upgrade is complete." | wall
- /etc/rc.notify_message -e -g -m "Upgrade is complete."
+ /etc/rc.notify_message -e -g -m "Upgrade is complete." >/dev/null 2>&1
fi
}
OpenPOWER on IntegriCloud