feat: add ability to load env vars via environment

Signed-off-by: loganprice <Logan.B.Price@gmail.com>
lima-vm · Sep 9, 2021 · 81d4831 · 81d4831
1 parent 1101b35
commit 81d4831
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,5 @@
+#LIMA-START
+{{- range $key, $val := .Env}}
+{{$key}}={{$val}}
+{{- end}}
+#LIMA-END