lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: sync plugins in console update; closes #5136

Browse Source
This commit is contained in:
Franco Fichtner 2021-08-01 11:27:05 +02:00
parent ccd00f6875
commit 7165b665eb
5 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plist
View File

@ -720,6 +720,7 @@
/usr/local/opnsense/scripts/firmware/security.sh
/usr/local/opnsense/scripts/firmware/sets.sh
/usr/local/opnsense/scripts/firmware/sync.sh
/usr/local/opnsense/scripts/firmware/sync.subr.sh
/usr/local/opnsense/scripts/firmware/unlock.sh
/usr/local/opnsense/scripts/firmware/update.sh
/usr/local/opnsense/scripts/firmware/upgrade.sh

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

@ -40,7 +40,7 @@ fi
if [ -z "${RELEASE}" ]; then
# already locked here, ok to call without launcher.sh
/usr/local/opnsense/scripts/firmware/update.sh
/usr/local/opnsense/scripts/firmware/update.sh sync
else
# already locked here, ok to call without launcher.sh
/usr/local/opnsense/scripts/firmware/upgrade.sh

11
src/opnsense/scripts/firmware/sync.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
# Copyright (C) 2020 Deciso B.V.
# Copyright (C) 2015-2020 Franco Fichtner <franco@opnsense.org>
# Copyright (C) 2015-2021 Franco Fichtner <franco@opnsense.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@ -26,16 +26,9 @@
# POSSIBILITY OF SUCH DAMAGE.
LOCKFILE=/tmp/pkg_upgrade.progress
PACKAGES=$(/usr/local/sbin/pluginctl -g system.firmware.plugins | /usr/bin/sed 's/,/ /g')
: > ${LOCKFILE}
echo "***GOT REQUEST TO SYNC***" >> ${LOCKFILE}
for PACKAGE in ${PACKAGES}; do
if ! pkg query %n ${PACKAGE} > /dev/null; then
pkg install -y ${PACKAGE} >> ${LOCKFILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php install ${PACKAGE} >> ${LOCKFILE} 2>&1
fi
done
pkg autoremove -y >> ${LOCKFILE} 2>&1
. /usr/local/opnsense/scripts/firmware/sync.subr.sh
echo '***DONE***' >> ${LOCKFILE}

36
src/opnsense/scripts/firmware/sync.subr.sh Executable file
View File

@ -0,0 +1,36 @@
#!/bin/sh
# Copyright (C) 2020-2021 Franco Fichtner <franco@opnsense.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
LOCKFILE=/tmp/pkg_upgrade.progress
PACKAGES=$(/usr/local/sbin/pluginctl -g system.firmware.plugins | /usr/bin/sed 's/,/ /g')
for PACKAGE in ${PACKAGES}; do
if ! pkg query %n ${PACKAGE} > /dev/null; then
pkg install -y ${PACKAGE} >> ${LOCKFILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php install ${PACKAGE} >> ${LOCKFILE} 2>&1
fi
done
pkg autoremove -y >> ${LOCKFILE} 2>&1

6
src/opnsense/scripts/firmware/update.sh
View File

@ -25,6 +25,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
CMD=${1}
LOCKFILE="/tmp/pkg_upgrade.progress"
PIPEFILE="/tmp/pkg_upgrade.pipe"
TEE="/usr/bin/tee -a"
@ -47,6 +48,11 @@ fi
# restart the web server
(/usr/local/etc/rc.restart_webgui 2>&1) | ${TEE} ${LOCKFILE}
# run plugin resolver if requested
if [ "${CMD}" = "sync" ]; then
. /usr/local/opnsense/scripts/firmware/sync.subr.sh
fi
# if we can update base, we'll do that as well
${TEE} ${LOCKFILE} < ${PIPEFILE} &
if opnsense-update -c > ${PIPEFILE} 2>&1; then