diff --git a/plist b/plist index bf269de16..e919ba8d8 100644 --- a/plist +++ b/plist @@ -581,7 +581,6 @@ /usr/local/opnsense/scripts/firmware/changelog.sh /usr/local/opnsense/scripts/firmware/check.sh /usr/local/opnsense/scripts/firmware/health.sh -/usr/local/opnsense/scripts/firmware/hotfix.sh /usr/local/opnsense/scripts/firmware/install.sh /usr/local/opnsense/scripts/firmware/launcher.sh /usr/local/opnsense/scripts/firmware/license.sh diff --git a/src/opnsense/scripts/firmware/hotfix.sh b/src/opnsense/scripts/firmware/hotfix.sh deleted file mode 100755 index a5892091c..000000000 --- a/src/opnsense/scripts/firmware/hotfix.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2016 Franco Fichtner -# 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. - -PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress -PATCH=${1} - -# Truncate upgrade progress file -: > ${PKG_PROGRESS_FILE} - -echo "***GOT REQUEST TO HOTFIX: ${PATCH}***" >> ${PKG_PROGRESS_FILE} -/usr/local/sbin/opnsense-patch ${PATCH} >> ${PKG_PROGRESS_FILE} 2>&1 -echo '***DONE***' >> ${PKG_PROGRESS_FILE} diff --git a/src/opnsense/scripts/firmware/launcher.sh b/src/opnsense/scripts/firmware/launcher.sh index b7cdd69fb..7b0338301 100755 --- a/src/opnsense/scripts/firmware/launcher.sh +++ b/src/opnsense/scripts/firmware/launcher.sh @@ -30,7 +30,6 @@ FLOCK="/usr/local/bin/flock -n -o" COMMANDS=" audit health -hotfix install lock reinstall diff --git a/src/opnsense/service/conf/actions.d/actions_firmware.conf b/src/opnsense/service/conf/actions.d/actions_firmware.conf index 654c74ed5..a261c05c9 100644 --- a/src/opnsense/service/conf/actions.d/actions_firmware.conf +++ b/src/opnsense/service/conf/actions.d/actions_firmware.conf @@ -107,12 +107,6 @@ parameters:%s type:script message: remove firmware package %s -[hotfix] -command: /usr/sbin/daemon -f /usr/local/opnsense/scripts/firmware/launcher.sh hotfix -parameters:%s -type:script -message:issued firmware hotfix for %s - [plugin] command: /usr/local/opnsense/scripts/firmware/plugin.sh parameters:%s