From c0e2db45eba6581e3a43546579d65e637d250ca4 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 14 Jan 2026 17:06:50 +0100 Subject: [PATCH] firmware: ok no safety net then >>> Invoking update script 'isc-dhcp-plugin.sh' Installing legacy ISC-DHCP plugin for compatibility... Strict TLS 1.3 and CRL checking is enabled. Updating OPNsense repository catalogue... OPNsense repository is up to date. All repositories are up to date. process with pid 7698 still holds the lock process with pid 7698 still holds the lock process with pid 7698 still holds the lock process with pid 7698 still holds the lock process with pid 7698 still holds the lock process with pid 7698 still holds the lock pkg: Cannot get an advisory lock on a database, it is locked by another process process with pid 7698 still holds the lock process with pid 7698 still holds the lock process with pid 7698 still holds the lock process with pid 7698 still holds the lock process with pid 7698 still holds the lock process with pid 7698 still holds the lock pkg: Cannot get an advisory lock on a database, it is locked by another process --- plist | 1 - .../rc.syshook.d/update/20-isc-dhcp-plugin.sh | 33 ------------------- 2 files changed, 34 deletions(-) delete mode 100755 src/etc/rc.syshook.d/update/20-isc-dhcp-plugin.sh diff --git a/plist b/plist index 04727f596e..db5f9e4a39 100644 --- a/plist +++ b/plist @@ -148,7 +148,6 @@ /usr/local/etc/rc.syshook.d/stop/90-backup /usr/local/etc/rc.syshook.d/stop/99-config /usr/local/etc/rc.syshook.d/update/10-refresh.sh -/usr/local/etc/rc.syshook.d/update/20-isc-dhcp-plugin.sh /usr/local/etc/rc.syshook.d/upgrade/10-sanity.sh /usr/local/etc/rc.syshook.d/upgrade/20-isc-dhcp-plugin.sh /usr/local/etc/rc.syshook.d/upgrade/90-cleanup.sh diff --git a/src/etc/rc.syshook.d/update/20-isc-dhcp-plugin.sh b/src/etc/rc.syshook.d/update/20-isc-dhcp-plugin.sh deleted file mode 100755 index ce96bad504..0000000000 --- a/src/etc/rc.syshook.d/update/20-isc-dhcp-plugin.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2026 Deciso B.V. -# -# 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. - -# XXX this is not for a stable release - -if [ ! -f /usr/local/opnsense/version/isc-dhcp ]; then - echo "Installing legacy ISC-DHCP plugin for compatibility..." - /usr/local/opnsense/scripts/firmware/launcher.sh -u install os-isc-dhcp-devel -else - echo "Skipping already installed legacy ISC-DHCP plugin..." -fi