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

firmware: use PKG variable for scripting, part 2

Browse Source
This commit is contained in:
Franco Fichtner 2024-11-13 11:41:16 +01:00
parent 2ab6cad193
commit 3849d4cbc5
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,10 +106,10 @@ if /usr/local/opnsense/scripts/firmware/changelog.sh fetch >> ${LOCKFILE} 2>&1;
fi
: > ${OUTFILE}
(pkg update -f 2>&1) | ${TEE} ${LOCKFILE} ${OUTFILE}
(${PKG} update -f 2>&1) | ${TEE} ${LOCKFILE} ${OUTFILE}
# always update pkg so we can see the real updates directly
(pkg upgrade -r ${product_repo} -Uy pkg 2>&1) | ${TEE} ${LOCKFILE}
# always update the package manager so we can see the real updates directly
(${PKG} upgrade -r ${product_repo} -Uy pkg 2>&1) | ${TEE} ${LOCKFILE}
# parse early errors
if grep -q 'No address record' ${OUTFILE}; then
@ -147,13 +147,14 @@ else
: > ${OUTFILE}
# now check what happens when we would go ahead
(pkg upgrade ${force_all} -Un 2>&1) | ${TEE} ${LOCKFILE} ${OUTFILE}
(${PKG} upgrade ${force_all} -Un 2>&1) | ${TEE} ${LOCKFILE} ${OUTFILE}
if [ -n "${CUSTOMPKG}" ]; then
(pkg install -Un "${CUSTOMPKG}" 2>&1) | ${TEE} ${LOCKFILE} ${OUTFILE}
(${PKG} install -Un "${CUSTOMPKG}" 2>&1) | ${TEE} ${LOCKFILE} ${OUTFILE}
elif [ "${product_id}" != "${product_target}" ]; then
(pkg install -r ${product_repo} -Un "${product_target}" 2>&1) | ${TEE} ${LOCKFILE} ${OUTFILE}
elif [ -z "$(pkg rquery %n ${product_id})" ]; then
# although this should say "to update matching" we emulate for check below as pkg does not catch this
(${PKG} install -r ${product_repo} -Un "${product_target}" 2>&1) | ${TEE} ${LOCKFILE} ${OUTFILE}
elif [ -z "$(${PKG} rquery %n ${product_id})" ]; then
# although this should say "to update matching" we emulate for
# check below as the package manager does not catch this
echo "self: No packages available to install matching '${product_id}'" | ${TEE} ${LOCKFILE} ${OUTFILE}
fi
@ -243,7 +244,7 @@ else
if [ -n "$packages_removed" ]; then
packages_removed=$packages_removed","
fi
packages_removed=$packages_removed"{\"name\":\"$i\",\"repository\":\"$(pkg query %R ${i})\","
packages_removed=$packages_removed"{\"name\":\"$i\",\"repository\":\"$(${PKG} query %R ${i})\","
fi
fi
if [ "$(expr $linecount + 1)" -eq "$itemcount" ]; then
@ -297,12 +298,12 @@ else
download_size=$(grep 'to be downloaded' ${OUTFILE} | awk -F '[ ]' '{print $1$2}' | tr '\n' ',' | sed 's/,$//')
# see if packages indicate a new version (not revision) of base / kernel
LQUERY=$(pkg query %v opnsense-update)
LQUERY=$(${PKG} query %v opnsense-update)
LQUERY=${LQUERY%%_*}
RQUERY=$(pkg rquery %v opnsense-update)
RQUERY=$(${PKG} rquery %v opnsense-update)
RQUERY=${RQUERY%%_*}
if [ -n "${force_all}" -o "$(pkg version -t ${LQUERY} ${RQUERY})" = "<" ]; then
if [ -n "${force_all}" -o "$(${PKG} version -t ${LQUERY} ${RQUERY})" = "<" ]; then
kernel_to_reboot="${RQUERY}"
base_to_reboot="${RQUERY}"
fi

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

@ -50,7 +50,7 @@ fi
# read reboot flag and record current package name and version state
ALWAYS_REBOOT=$(/usr/local/sbin/pluginctl -g system.firmware.reboot)
PKGS_HASH=$(pkg query %n-%v 2> /dev/null | sha256)
PKGS_HASH=$(${PKG} query %n-%v 2> /dev/null | sha256)
# upgrade all packages if possible
(opnsense-update ${FORCE} -pt "opnsense${SUFFIX}" 2>&1) | ${TEE} ${LOCKFILE}
@ -75,7 +75,7 @@ if opnsense-update ${FORCE} -bk -c > ${PIPEFILE} 2>&1; then
fi
if [ -n "${ALWAYS_REBOOT}" ]; then
if [ "${PKGS_HASH}" != "$(pkg query %n-%v 2> /dev/null | sha256)" ]; then
if [ "${PKGS_HASH}" != "$(${PKG} query %n-%v 2> /dev/null | sha256)" ]; then
echo '***REBOOT***' >> ${LOCKFILE}
sleep 5
/usr/local/etc/rc.reboot