From 81d4831fab4ff7e849d5bcdf4bc90f5fc31fa5e6 Mon Sep 17 00:00:00 2001
From: loganprice <Logan.B.Price@gmail.com>
Date: Sun, 5 Sep 2021 01:01:12 +0000
Subject: [PATCH] feat: add ability to load env vars via environment

Signed-off-by: loganprice <Logan.B.Price@gmail.com>
---
 pkg/cidata/cidata.TEMPLATE.d/boot.sh          | 8 ++++++++
 pkg/cidata/cidata.TEMPLATE.d/lima.env         | 3 ---
 pkg/cidata/cidata.TEMPLATE.d/lima.environment | 5 +++++
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pkg/cidata/cidata.TEMPLATE.d/lima.environment

diff --git a/pkg/cidata/cidata.TEMPLATE.d/boot.sh b/pkg/cidata/cidata.TEMPLATE.d/boot.sh
index 5d707843380..f77f7cebe3b 100644
--- a/pkg/cidata/cidata.TEMPLATE.d/boot.sh
+++ b/pkg/cidata/cidata.TEMPLATE.d/boot.sh
@@ -12,6 +12,14 @@ WARNING() {
 # shellcheck disable=SC2163
 while read -r line; do export "$line"; done <"${LIMA_CIDATA_MNT}"/lima.env
 
+sed -i '/#LIMA-START/,/#LIMA-END/d' /etc/environment
+cat "${LIMA_CIDATA_MNT}/lima.environment" >>/etc/environment
+
+# shellcheck disable=SC2163
+while read -r line; do
+	[ "$(expr "$line" : '#')" -eq 0 ] && export "$line"
+done <"${LIMA_CIDATA_MNT}"/lima.environment
+
 CODE=0
 
 for f in "${LIMA_CIDATA_MNT}"/boot/*; do
diff --git a/pkg/cidata/cidata.TEMPLATE.d/lima.env b/pkg/cidata/cidata.TEMPLATE.d/lima.env
index 79d4cd0a1fe..d9d30eac67c 100644
--- a/pkg/cidata/cidata.TEMPLATE.d/lima.env
+++ b/pkg/cidata/cidata.TEMPLATE.d/lima.env
@@ -15,6 +15,3 @@ LIMA_CIDATA_CONTAINERD_SYSTEM=1
 LIMA_CIDATA_CONTAINERD_SYSTEM=
 {{- end}}
 LIMA_CIDATA_SLIRP_GATEWAY={{ .SlirpGateway }}
-{{- range $key, $val := .Env}}
-{{$key}}={{$val}}
-{{- end}}
diff --git a/pkg/cidata/cidata.TEMPLATE.d/lima.environment b/pkg/cidata/cidata.TEMPLATE.d/lima.environment
new file mode 100644
index 00000000000..311d9cd60b0
--- /dev/null
+++ b/pkg/cidata/cidata.TEMPLATE.d/lima.environment
@@ -0,0 +1,5 @@
+#LIMA-START
+{{- range $key, $val := .Env}}
+{{$key}}={{$val}}
+{{- end}}
+#LIMA-END