firmware: fold this down to the portable opnsense-update -X call

This commit is contained in:
Franco Fichtner 2023-11-14 09:33:12 +01:00
parent 2921576302
commit b8b3da07db
2 changed files with 2 additions and 25 deletions

View File

@ -1,5 +1,6 @@
#!/bin/sh
URL="$(opnsense-update -X)/sets/bogons.txz"
DESTDIR="/usr/local/etc"
WORKDIR="/tmp/bogons"
FETCH="fetch -qT 30"
@ -7,19 +8,6 @@ RETRIES=3
COMMAND=${1}
CORE_ABI=$(opnsense-version -a)
SYS_ABI=$(opnsense-verify -a)
# force amd64 here since bogons are not published elsewhere
URLPREFIX="https://pkg.opnsense.org/${SYS_ABI%:*}:amd64/${CORE_ABI}"
if [ -n "$(opnsense-update -x)" ]; then
# fix ABI mismatch for business mirror by using it directly
URLPREFIX=$(opnsense-update -M)
fi
URL="${URLPREFIX}/sets/bogons.txz"
echo "bogons update starting" | logger
while [ ${RETRIES} -gt 0 ]; do

View File

@ -48,18 +48,7 @@ changelog_checksum()
changelog_url()
{
CORE_ABI=$(opnsense-version -x)
SYS_ABI=$(opnsense-verify -a)
# force amd64 here since changelogs are not published elsewhere
URLPREFIX="https://pkg.opnsense.org/${SYS_ABI%:*}:amd64/${CORE_ABI}"
if [ -n "$(opnsense-update -x)" ]; then
# changelogs differ for business subscriptions
URLPREFIX=$(opnsense-update -M)
fi
echo "${URLPREFIX}/sets/changelog.txz"
echo "$(opnsense-update -X)/sets/changelog.txz"
}
changelog_fetch()