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

firmware: get rid of old naming convention; closes #4718

Browse Source
This commit is contained in:
Franco Fichtner 2021-02-19 11:43:03 +01:00
parent eb6cbc0164
commit 38b0e8ff6c
7 changed files with 58 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/opnsense/scripts/firmware/install.sh
View File

@ -25,13 +25,12 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
LOCKFILE=/tmp/pkg_upgrade.progress
PACKAGE=${1}
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
: > ${LOCKFILE}
echo "***GOT REQUEST TO INSTALL***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO INSTALL***" >> ${LOCKFILE}
if [ "${PACKAGE#os-}" != "${PACKAGE}" ]; then
COREPKG=$(opnsense-version -n)
COREVER=$(opnsense-version -v)
@ -39,12 +38,12 @@ if [ "${PACKAGE#os-}" != "${PACKAGE}" ]; then
# plugins must pass a version check on up-to-date core package
if ! php -r "exit(version_compare('${COREVER}','${REPOVER}') >= 0 ? 0 : 1);"; then
echo "Installation out of date. The update to ${COREPKG}-${REPOVER} is required." >> ${PKG_PROGRESS_FILE} 2>&1
echo '***DONE***' >> ${PKG_PROGRESS_FILE}
echo "Installation out of date. The update to ${COREPKG}-${REPOVER} is required." >> ${LOCKFILE} 2>&1
echo '***DONE***' >> ${LOCKFILE}
exit
fi
fi
pkg install -y ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php install ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
pkg autoremove -y >> ${PKG_PROGRESS_FILE} 2>&1
echo '***DONE***' >> ${PKG_PROGRESS_FILE}
pkg install -y ${PACKAGE} >> ${LOCKFILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php install ${PACKAGE} >> ${LOCKFILE} 2>&1
pkg autoremove -y >> ${LOCKFILE} 2>&1
echo '***DONE***' >> ${LOCKFILE}

19
src/opnsense/scripts/firmware/lock.sh
View File

@ -25,20 +25,19 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
LOCKFILE=/tmp/pkg_upgrade.progress
PACKAGE=${1}
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
: > ${LOCKFILE}
echo "***GOT REQUEST TO LOCK***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO LOCK***" >> ${LOCKFILE}
if [ "${PACKAGE}" = "base" ]; then
echo "Locking base set" >> ${PKG_PROGRESS_FILE}
opnsense-update -bL >> ${PKG_PROGRESS_FILE} 2>&1
echo "Locking base set" >> ${LOCKFILE}
opnsense-update -bL >> ${LOCKFILE} 2>&1
elif [ "${PACKAGE}" = "kernel" ]; then
echo "Locking kernel set" >> ${PKG_PROGRESS_FILE}
opnsense-update -kL >> ${PKG_PROGRESS_FILE} 2>&1
echo "Locking kernel set" >> ${LOCKFILE}
opnsense-update -kL >> ${LOCKFILE} 2>&1
else
pkg lock -y ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
pkg lock -y ${PACKAGE} >> ${LOCKFILE} 2>&1
fi
echo '***DONE***' >> ${PKG_PROGRESS_FILE}
echo '***DONE***' >> ${LOCKFILE}

25
src/opnsense/scripts/firmware/reinstall.sh
View File

@ -25,46 +25,45 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
LOCKFILE=/tmp/pkg_upgrade.progress
PACKAGE=${1}
REBOOT=
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
: > ${LOCKFILE}
echo "***GOT REQUEST TO REINSTALL***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO REINSTALL***" >> ${LOCKFILE}
if [ "${PACKAGE}" = "base" ]; then
if opnsense-update -Tb; then
# force reinstall intended
if opnsense-update -bf >> ${PKG_PROGRESS_FILE} 2>&1; then
if opnsense-update -bf >> ${LOCKFILE} 2>&1; then
REBOOT=1
fi
else
# for locked message only
opnsense-update -b >> ${PKG_PROGRESS_FILE} 2>&1
opnsense-update -b >> ${LOCKFILE} 2>&1
fi
elif [ "${PACKAGE}" = "kernel" ]; then
if opnsense-update -Tk; then
# force reinstall intended
if opnsense-update -kf >> ${PKG_PROGRESS_FILE} 2>&1; then
if opnsense-update -kf >> ${LOCKFILE} 2>&1; then
REBOOT=1
fi
else
# for locked message only
opnsense-update -k >> ${PKG_PROGRESS_FILE} 2>&1
opnsense-update -k >> ${LOCKFILE} 2>&1
fi
else
opnsense-revert -l ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php install ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
pkg autoremove -y >> ${PKG_PROGRESS_FILE} 2>&1
opnsense-revert -l ${PACKAGE} >> ${LOCKFILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php install ${PACKAGE} >> ${LOCKFILE} 2>&1
pkg autoremove -y >> ${LOCKFILE} 2>&1
fi
if [ -n "${REBOOT}" ]; then
echo '***REBOOT***' >> ${PKG_PROGRESS_FILE}
echo '***REBOOT***' >> ${LOCKFILE}
# give the frontend some time to figure out that a reboot is coming
sleep 5
/usr/local/etc/rc.reboot
fi
echo '***DONE***' >> ${PKG_PROGRESS_FILE}
echo '***DONE***' >> ${LOCKFILE}

15
src/opnsense/scripts/firmware/remove.sh
View File

@ -25,14 +25,13 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
LOCKFILE=/tmp/pkg_upgrade.progress
PACKAGE=$1
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
: > ${LOCKFILE}
echo "***GOT REQUEST TO REMOVE***" >> ${PKG_PROGRESS_FILE}
pkg remove -y ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php remove ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
pkg autoremove -y >> ${PKG_PROGRESS_FILE} 2>&1
echo '***DONE***' >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO REMOVE***" >> ${LOCKFILE}
pkg remove -y ${PACKAGE} >> ${LOCKFILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php remove ${PACKAGE} >> ${LOCKFILE} 2>&1
pkg autoremove -y >> ${LOCKFILE} 2>&1
echo '***DONE***' >> ${LOCKFILE}

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

@ -24,11 +24,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
LOCKFILE=/tmp/pkg_upgrade.progress
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
: > ${LOCKFILE}
echo "***GOT REQUEST TO RESYNC***" >> ${PKG_PROGRESS_FILE}
/usr/local/opnsense/scripts/firmware/register.php resync >> ${PKG_PROGRESS_FILE} 2>&1
echo '***DONE***' >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO RESYNC***" >> ${LOCKFILE}
/usr/local/opnsense/scripts/firmware/register.php resync >> ${LOCKFILE} 2>&1
echo '***DONE***' >> ${LOCKFILE}

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

@ -25,18 +25,17 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
LOCKFILE=/tmp/pkg_upgrade.progress
PACKAGES=$(/usr/local/sbin/pluginctl -g system.firmware.plugins | /usr/bin/sed 's/,/ /g')
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
: > ${LOCKFILE}
echo "***GOT REQUEST TO SYNC***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO SYNC***" >> ${LOCKFILE}
for PACKAGE in ${PACKAGES}; do
if ! pkg query %n ${PACKAGE} > /dev/null; then
pkg install -y ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php install ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
pkg install -y ${PACKAGE} >> ${LOCKFILE} 2>&1
/usr/local/opnsense/scripts/firmware/register.php install ${PACKAGE} >> ${LOCKFILE} 2>&1
fi
done
pkg autoremove -y >> ${PKG_PROGRESS_FILE} 2>&1
echo '***DONE***' >> ${PKG_PROGRESS_FILE}
pkg autoremove -y >> ${LOCKFILE} 2>&1
echo '***DONE***' >> ${LOCKFILE}

19
src/opnsense/scripts/firmware/unlock.sh
View File

@ -25,20 +25,19 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
LOCKFILE=/tmp/pkg_upgrade.progress
PACKAGE=${1}
# Truncate upgrade progress file
: > ${PKG_PROGRESS_FILE}
: > ${LOCKFILE}
echo "***GOT REQUEST TO UNLOCK***" >> ${PKG_PROGRESS_FILE}
echo "***GOT REQUEST TO UNLOCK***" >> ${LOCKFILE}
if [ "${PACKAGE}" = "base" ]; then
echo "Unlocking base set" >> ${PKG_PROGRESS_FILE}
opnsense-update -bU >> ${PKG_PROGRESS_FILE} 2>&1
echo "Unlocking base set" >> ${LOCKFILE}
opnsense-update -bU >> ${LOCKFILE} 2>&1
elif [ "${PACKAGE}" = "kernel" ]; then
echo "Unlocking kernel set" >> ${PKG_PROGRESS_FILE}
opnsense-update -kU >> ${PKG_PROGRESS_FILE} 2>&1
echo "Unlocking kernel set" >> ${LOCKFILE}
opnsense-update -kU >> ${LOCKFILE} 2>&1
else
pkg unlock -y ${PACKAGE} >> ${PKG_PROGRESS_FILE} 2>&1
pkg unlock -y ${PACKAGE} >> ${LOCKFILE} 2>&1
fi
echo '***DONE***' >> ${PKG_PROGRESS_FILE}
echo '***DONE***' >> ${LOCKFILE}