From d4378f00b3b725dd476e948a1d43abd26987c48c Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 22 Nov 2024 08:10:33 +0100 Subject: [PATCH] firmware: opnsense-update -Q now installs the tests set Since the test set follows the kernel it would be better to just support it in opnsense-update which is done. "qyua" can use this to bootstrap and we do not have to worry about fetch env for this optional component as it cannot be installed from the GUI or console menu. --- plist | 1 - src/opnsense/scripts/firmware/config.sh | 1 - src/opnsense/scripts/firmware/tests.sh | 43 ------------------------- 3 files changed, 45 deletions(-) delete mode 100755 src/opnsense/scripts/firmware/tests.sh diff --git a/plist b/plist index 4d12eef93..9949a0b8f 100644 --- a/plist +++ b/plist @@ -1108,7 +1108,6 @@ /usr/local/opnsense/scripts/firmware/security.sh /usr/local/opnsense/scripts/firmware/sync.sh /usr/local/opnsense/scripts/firmware/sync.subr.sh -/usr/local/opnsense/scripts/firmware/tests.sh /usr/local/opnsense/scripts/firmware/unlock.sh /usr/local/opnsense/scripts/firmware/update.sh /usr/local/opnsense/scripts/firmware/upgrade.sh diff --git a/src/opnsense/scripts/firmware/config.sh b/src/opnsense/scripts/firmware/config.sh index 7fa2ee1dd..b58573560 100755 --- a/src/opnsense/scripts/firmware/config.sh +++ b/src/opnsense/scripts/firmware/config.sh @@ -53,7 +53,6 @@ remove resync security sync -tests unlock update upgrade diff --git a/src/opnsense/scripts/firmware/tests.sh b/src/opnsense/scripts/firmware/tests.sh deleted file mode 100755 index 16d4498eb..000000000 --- a/src/opnsense/scripts/firmware/tests.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2024 Franco Fichtner -# -# 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 BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. - -. /usr/local/opnsense/scripts/firmware/config.sh - -set -e - -DESTDIR="/usr/tests" -FETCH="fetch -qT 30" - -URL="$(opnsense-update -M)/../snapshots/sets/tests-24.7-$(uname -p).txz" - -${FETCH} -o /tmp/tests.txz "${URL}" -${FETCH} -o /tmp/tests.txz.sig "${URL}.sig" - -opnsense-verify -q /tmp/tests.txz - -rm -rf ${DESTDIR} -tar -C / -xJf /tmp/tests.txz