From: Septatrix <24257556+Septatrix@users.noreply.github.com>
Date: Mon, 28 Oct 2024 14:56:09 +0000 (+0100)
Subject: Unset $CONFIG in prepare scripts
X-Git-Tag: v25~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6cacce25a07d3f3231564ebaca1ed4468970311;p=thirdparty%2Fmkosi.git

Unset $CONFIG in prepare scripts
---

diff --git a/mkosi.prepare.chroot b/mkosi.prepare.chroot
index ded1f5e2d..1749c0914 100755
--- a/mkosi.prepare.chroot
+++ b/mkosi.prepare.chroot
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 
+# Users might set $CONFIG but that influences pacman
+# so we unset it here to avoid any issues.
+unset CONFIG
+
 if [ "$1" = "final" ] && command -v pacman-key; then
     pacman-key --init
     pacman-key --populate archlinux
diff --git a/mkosi/resources/mkosi-tools/mkosi.prepare.chroot b/mkosi/resources/mkosi-tools/mkosi.prepare.chroot
index 754015efb..1749c0914 100755
--- a/mkosi/resources/mkosi-tools/mkosi.prepare.chroot
+++ b/mkosi/resources/mkosi-tools/mkosi.prepare.chroot
@@ -1,5 +1,10 @@
 #!/bin/sh
 # SPDX-License-Identifier: LGPL-2.1-or-later
+set -e
+
+# Users might set $CONFIG but that influences pacman
+# so we unset it here to avoid any issues.
+unset CONFIG
 
 if [ "$1" = "final" ] && command -v pacman-key; then
     pacman-key --init