cidata: move provision.* directories to provision/*.

Fix #3845.
This change may work around #3845 caused by diskfs/go-diskfs.

Signed-off-by: Norio Nomura <norio.nomura@gmail.com>

Author: norio-nomura

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

@@ -57,8 +57,8 @@ deref() {
 	eval echo \$"$1"
 }
 
-if [ -d "${LIMA_CIDATA_MNT}"/provision.data ]; then
-	for f in "${LIMA_CIDATA_MNT}"/provision.data/*; do
+if [ -d "${LIMA_CIDATA_MNT}"/provision/data ]; then
+	for f in "${LIMA_CIDATA_MNT}"/provision/data/*; do
 		filename=$(basename "$f")
 		overwrite=$(deref "LIMA_CIDATA_DATAFILE_${filename}_OVERWRITE")
 		owner=$(deref "LIMA_CIDATA_DATAFILE_${filename}_OWNER")
@@ -77,8 +77,8 @@ if [ -d "${LIMA_CIDATA_MNT}"/provision.data ]; then
 	done
 fi
 
-if [ -d "${LIMA_CIDATA_MNT}"/provision.system ]; then
-	for f in "${LIMA_CIDATA_MNT}"/provision.system/*; do
+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"
@@ -88,12 +88,12 @@ if [ -d "${LIMA_CIDATA_MNT}"/provision.system ]; then
 fi
 
 USER_SCRIPT="${LIMA_CIDATA_HOME}/.lima-user-script"
-if [ -d "${LIMA_CIDATA_MNT}"/provision.user ]; then
+if [ -d "${LIMA_CIDATA_MNT}"/provision/user ]; then
 	if [ ! -f /sbin/openrc-run ]; then
 		until [ -e "/run/user/${LIMA_CIDATA_UID}/systemd/private" ]; do sleep 3; done
 	fi
 	params=$(grep -o '^PARAM_[^=]*' "${LIMA_CIDATA_MNT}"/param.env | paste -sd ,)
-	for f in "${LIMA_CIDATA_MNT}"/provision.user/*; do
+	for f in "${LIMA_CIDATA_MNT}"/provision/user/*; do
 		INFO "Executing $f (as user ${LIMA_CIDATA_USER})"
 		cp "$f" "${USER_SCRIPT}"
 		chown "${LIMA_CIDATA_USER}" "${USER_SCRIPT}"

pkg/cidata/cidata.TEMPLATE.d/boot/30-install-packages.sh

@@ -15,10 +15,10 @@ fi
 
 # Install minimum dependencies
 # Run any user provided dependency scripts first
-if [ -d "${LIMA_CIDATA_MNT}"/provision.dependency ]; then
+if [ -d "${LIMA_CIDATA_MNT}"/provision/dependency ]; then
 	echo "Detected dependency provisioning scripts, running before default dependency installation"
 	CODE=0
-	for f in "${LIMA_CIDATA_MNT}"/provision.dependency/*; do
+	for f in "${LIMA_CIDATA_MNT}"/provision/dependency/*; do
 		if ! "$f"; then
 			CODE=1
 		fi

pkg/cidata/cidata.go

@@ -375,12 +375,12 @@ func GenerateISO9660(ctx context.Context, instDir, name string, instConfig *lima
 		switch f.Mode {
 		case limayaml.ProvisionModeSystem, limayaml.ProvisionModeUser, limayaml.ProvisionModeDependency:
 			layout = append(layout, iso9660util.Entry{
-				Path:   fmt.Sprintf("provision.%s/%08d", f.Mode, i),
+				Path:   fmt.Sprintf("provision/%s/%08d", f.Mode, i),
 				Reader: strings.NewReader(f.Script),
 			})
 		case limayaml.ProvisionModeData:
 			layout = append(layout, iso9660util.Entry{
-				Path:   fmt.Sprintf("provision.%s/%08d", f.Mode, i),
+				Path:   fmt.Sprintf("provision/%s/%08d", f.Mode, i),
 				Reader: strings.NewReader(*f.Content),
 			})
 		case limayaml.ProvisionModeBoot:

website/content/en/docs/dev/internals.md

@@ -148,8 +148,10 @@ See [Building Ansible inventories](https://docs.ansible.com/ansible/latest/inven
 - `boot.sh`: Boot script
 - `boot/*`: Boot script modules
 - `util/*`: Utility command scripts, executed in the boot script modules
-- `provision.system/*`: Custom provision scripts (system)
-- `provision.user/*`: Custom provision scripts (user)
+- `provision/data/*`: Custom provision files (data)
+- `provision/dependency/*`: Custom provision scripts (dependency)
+- `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