cidata: split boot.sh

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

docs/internal.md

@@ -67,7 +67,8 @@ The directory contains the following files:
 - `lima.env`: the environment variables
 - `lima-guestagent`: Lima guest agent binary
 - `nerdctl-full.tgz`: [`nerdctl-full-<VERSION>-linux-<ARCH>.tar.gz`](https://github.com/containerd/nerdctl/releases)
-- `boot/*`: Boot scripts
+- `boot.sh`: Boot script
+- `boot/*`: Boot script modules
 - `provision.system/*`: Custom provision scripts (system)
 - `provision.user/*`: Custom provision scripts (user)
 

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

@@ -0,0 +1,47 @@
+#!/bin/sh
+set -eu
+
+INFO(){
+  echo "LIMA| $*"
+}
+
+WARNING(){
+  echo "LIMA| WARNING: $*"
+}
+
+# shellcheck disable=SC2163
+while read -r line; do export "$line"; done <"${LIMA_CIDATA_MNT}"/lima.env
+
+CODE=0
+
+for f in "${LIMA_CIDATA_MNT}"/boot/*; do
+	INFO "Executing $f"
+	if ! "$f"; then
+		WARNING "Failed to execute $f"
+		CODE=1
+	fi
+done
+
+if [ -d "${LIMA_CIDATA_MNT}"/provision.system ]; then
+	for f in "${LIMA_CIDATA_MNT}"/provision.system/*; do
+		INFO "Executing $f"
+		if ! "$f"; then
+			WARNING "Failed to execute $f"
+			CODE=1
+		fi
+	done
+fi
+
+if [ -d "${LIMA_CIDATA_MNT}"/provision.user ]; then
+	until [ -e "/run/user/${LIMA_CIDATA_UID}}/systemd/private" ]; do sleep 3; done
+	for f in "${LIMA_CIDATA_MNT}"/provision.user/*; do
+		INFO "Executing $f (as user ${LIMA_CIDATA_USER})"
+		if ! sudo -iu "${LIMA_CIDATA_USER}" "XDG_RUNTIME_DIR=/run/user/${LIMA_CIDATA_UID}" "$f"; then
+			WARNING "Failed to execute $f (as user ${LIMA_CIDATA_USER})"
+			CODE=1
+		fi
+	done
+fi
+
+INFO "Exiting with code $CODE"
+exit "$CODE"

pkg/cidata/cidata.TEMPLATE.d/user-data

@@ -26,35 +26,7 @@ write_files:
       mkdir -p -m 700 "${LIMA_CIDATA_MNT}"
       mount -o ro,mode=0700,dmode=0700,overriderockperm,exec,uid=0 "${LIMA_CIDATA_DEV}" "${LIMA_CIDATA_MNT}"
       export LIMA_CIDATA_MNT
-      while read line ; do export "$line"; done <"${LIMA_CIDATA_MNT}"/lima.env
-      CODE=0
-      for f in "${LIMA_CIDATA_MNT}"/boot/*; do
-        echo "Executing $f"
-        if ! "$f"; then
-          echo "Failed to execute $f"
-          CODE=1
-        fi
-      done
-      if [ -d "${LIMA_CIDATA_MNT}"/provision.system ]; then
-        for f in "${LIMA_CIDATA_MNT}"/provision.system/*; do
-          echo "Executing $f"
-          if ! "$f"; then
-            echo "Failed to execute $f"
-            CODE=1
-          fi
-        done
-      fi
-      if [ -d "${LIMA_CIDATA_MNT}"/provision.user ]; then
-        until [ -e "/run/user/${LIMA_CIDATA_UID}}/systemd/private" ]; do sleep 3; done
-        for f in "${LIMA_CIDATA_MNT}"/provision.user/*; do
-          echo "Executing $f (as user ${LIMA_CIDATA_USER})"
-          if ! sudo -iu "${LIMA_CIDATA_USER}" "XDG_RUNTIME_DIR=/run/user/${LIMA_CIDATA_UID}" "$f"; then
-            echo "Failed to execute $f (as user ${LIMA_CIDATA_USER})"
-            CODE=1
-          fi
-        done
-      fi
-      exit "$CODE"
+      exec "${LIMA_CIDATA_MNT}"/boot.sh
    owner: root:root
    path: /var/lib/cloud/scripts/per-boot/00-lima.boot.sh
    permissions: '0755'