Merge pull request #228 from rancher-sandbox/etc_environment

Rename lima.environment → etc_environment

Author: jandubois

docs/internal.md

@@ -86,13 +86,14 @@ The directory contains the following files:
 - `user-data`: [Cloud-init user-data](https://cloudinit.readthedocs.io/en/latest/topics/format.html)
 - `meta-data`: [Cloud-init meta-data](https://cloudinit.readthedocs.io/en/latest/topics/instancedata.html)
 - `network-config`: [Cloud-init Networking Config Version 2](https://cloudinit.readthedocs.io/en/latest/topics/network-config-format-v2.html)
-- `lima.env`: the environment variables
+- `lima.env`: The `LIMA_CIDATA_*` environment variables (see below) available during `boot.sh` processing
 - `lima-guestagent`: Lima guest agent binary
 - `nerdctl-full.tgz`: [`nerdctl-full-<VERSION>-linux-<ARCH>.tar.gz`](https://github.com/containerd/nerdctl/releases)
 - `boot.sh`: Boot script
 - `boot/*`: Boot script modules
 - `provision.system/*`: Custom provision scripts (system)
 - `provision.user/*`: Custom provision scripts (user)
+- `etc_environment`: Environment variables to be added to `/etc/environment` (also loaded during `boot.sh`)
 
 Max file name length = 30
 

pkg/cidata/cidata.TEMPLATE.d/boot.sh

@@ -13,12 +13,12 @@ WARNING() {
 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
+cat "${LIMA_CIDATA_MNT}/etc_environment" >>/etc/environment
 
 # shellcheck disable=SC2163
 while read -r line; do
 	[ "$(expr "$line" : '#')" -eq 0 ] && export "$line"
-done <"${LIMA_CIDATA_MNT}"/lima.environment
+done <"${LIMA_CIDATA_MNT}"/etc_environment
 
 CODE=0
 
@@ -40,7 +40,7 @@ if [ -d "${LIMA_CIDATA_MNT}"/provision.system ]; then
 	done
 fi
 
-USER_SCRIPT="/home/${LIMA_CIDATA_USER}.linux/.lime-user-script"
+USER_SCRIPT="/home/${LIMA_CIDATA_USER}.linux/.lima-user-script"
 if [ -d "${LIMA_CIDATA_MNT}"/provision.user ]; then
 	if [ ! -f /etc/alpine-release ]; then
 		until [ -e "/run/user/${LIMA_CIDATA_UID}/systemd/private" ]; do sleep 3; done