From fcea28eb38adfcf2117d9b8bc9b9adb608799208 Mon Sep 17 00:00:00 2001
From: Dor Askayo <dor.askayo@gmail.com>
Date: Sun, 15 May 2022 11:49:50 +0300
Subject: [PATCH] Don't export variables from bootstrap.cfg

These variables should only affect live-bootstrap's scripts, yet they
currently "pollute" the build environment of most packages during the
bootstrap unnecessarily.

This change also makes bootstrap.cfg keep the same format between the
different bootstrap stages, which simplifies the input to each step.
---
 sysa/run.sh | 6 +++---
 sysb/run.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sysa/run.sh b/sysa/run.sh
index cd5a7a2..d703091 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -72,7 +72,7 @@ if [ -z "${CHROOT}" ]; then
     ask_chroot
     echo
 
-    echo "export CHROOT=${CHROOT}" >> "${SOURCES}/bootstrap.cfg"
+    echo "CHROOT=${CHROOT}" >> "${SOURCES}/bootstrap.cfg"
 fi
 
 ask_timestamps() {
@@ -94,12 +94,12 @@ if [ -z "${FORCE_TIMESTAMPS}" ]; then
     ask_timestamps
     echo
 
-    echo "export FORCE_TIMESTAMPS=${FORCE_TIMESTAMPS}" >> "${SOURCES}/bootstrap.cfg"
+    echo "FORCE_TIMESTAMPS=${FORCE_TIMESTAMPS}" >> "${SOURCES}/bootstrap.cfg"
 fi
 
 echo "Thank you! All done."
 
-echo "export ARCH=${ARCH}" >> "${SOURCES}/bootstrap.cfg"
+echo "ARCH=${ARCH}" >> "${SOURCES}/bootstrap.cfg"
 
 mkdir -p "${DESTDIR}" "${REPO}" /dev
 
diff --git a/sysb/run.sh b/sysb/run.sh
index ba38d4d..841b81c 100755
--- a/sysb/run.sh
+++ b/sysb/run.sh
@@ -54,7 +54,7 @@ if [ -z "${DISK}" ] || ! [ -e "/dev/${DISK}" ]; then
     echo "You did not provide a valid disk in the configuration file."
     ask_disk
 
-    echo "export DISK=${DISK}" >> /usr/src/bootstrap.cfg
+    echo "DISK=${DISK}" >> /usr/src/bootstrap.cfg
 fi
 
 PREFIX=/usr