From 890ca6435e74e42fda96302db8af209dc1a026eb Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 30 Jan 2024 13:31:47 +0100
Subject: [PATCH] firmware: fix a glitch taining the upgrade log while
 installing squid

Only callers of -u are changelog.sh and install.sh but changelog.sh
doesn't even support LOCKFILE so do a mininal fix.
---
 src/opnsense/scripts/firmware/install.sh  | 2 +-
 src/opnsense/scripts/firmware/launcher.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/scripts/firmware/install.sh b/src/opnsense/scripts/firmware/install.sh
index a20905db4..5bbe6e3a0 100755
--- a/src/opnsense/scripts/firmware/install.sh
+++ b/src/opnsense/scripts/firmware/install.sh
@@ -25,7 +25,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-LOCKFILE=/tmp/pkg_upgrade.progress
+LOCKFILE=${LOCKFILE:-/tmp/pkg_upgrade.progress}
 PACKAGE=${1}
 TEE="/usr/bin/tee -a"
 
diff --git a/src/opnsense/scripts/firmware/launcher.sh b/src/opnsense/scripts/firmware/launcher.sh
index 961034c13..c11b393f6 100755
--- a/src/opnsense/scripts/firmware/launcher.sh
+++ b/src/opnsense/scripts/firmware/launcher.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2016-2023 Franco Fichtner <franco@opnsense.org>
+# Copyright (C) 2016-2024 Franco Fichtner <franco@opnsense.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -107,7 +107,7 @@ fi
 if [ -z "${DO_UNLOCKED}" ]; then
 	${FLOCK} ${LOCKFILE} ${COMMAND} "${@}"
 else
-	${COMMAND} "${@}"
+	env LOCKFILE=/dev/null ${COMMAND} "${@}"
 fi
 
 RET=${?}