lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: piped status return was wrong

Browse Source
This commit is contained in:
Franco Fichtner 2016-10-11 08:47:19 +02:00
parent f7ffa6e4d6
commit e6fa852e1f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/etc/rc.firmware.subr
View File

@ -28,22 +28,28 @@
set -e
LOCKFILE="/tmp/pkg_upgrade.progress"
PIPEFILE="/tmp/pkg_upgrade.pipe"
TEE="/usr/bin/tee -a"
: > ${LOCKFILE}
rm -f ${PIPEFILE}
mkfifo ${PIPEFILE}
echo "***GOT REQUEST TO UPGRADE***" >> ${LOCKFILE}
if [ -z "${1}" ]; then
# upgrade all packages if possible
opnsense-update -p 2>&1 | ${TEE} ${LOCKFILE}
${TEE} ${LOCKFILE} < ${PIPEFILE} &
opnsense-update -p 2>&1 > ${PIPEFILE}
# trigger a webgui restart to cope with changes
/usr/local/etc/rc.restart_webgui 2>&1 | ${TEE} ${LOCKFILE}
${TEE} ${LOCKFILE} < ${PIPEFILE} &
/usr/local/etc/rc.restart_webgui 2>&1 > ${PIPEFILE}
# if we can update base, we'll do that as well
if opnsense-update -c; then
if opnsense-update -bk 2>&1 | ${TEE} ${LOCKFILE}; then
${TEE} ${LOCKFILE} < ${PIPEFILE} &
if opnsense-update -bk 2>&1 > ${PIPEFILE}; then
echo '***REBOOT***' >> ${LOCKFILE}
sleep 5
/usr/local/etc/rc.reboot
@ -51,7 +57,8 @@ if [ -z "${1}" ]; then
fi
elif [ "${1}" = "upgrade" -a -n "${2}" ]; then
# upgrade to a major release
if opnsense-update -ur ${2} 2>&1 | ${TEE} ${LOCKFILE}; then
${TEE} ${LOCKFILE} < ${PIPEFILE} &
if opnsense-update -ur ${2} 2>&1 > ${PIPEFILE}; then
echo '***REBOOT***' >> ${LOCKFILE}
sleep 5
/usr/local/etc/rc.reboot