cidata: deduplicate iso9660 mounter

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

Author: AkihiroSuda

pkg/cidata/cidata.TEMPLATE.d/boot/25-guestagent-base.sh

@@ -8,10 +8,7 @@ chown "{{$.User}}" "{{$val}}" || true
 {{- end}}
 
 # Install or update the guestagent binary
-mkdir -p -m 600 /mnt/lima-cidata
-mount -t iso9660 -o ro /dev/disk/by-label/cidata /mnt/lima-cidata
-install -m 755 /mnt/lima-cidata/lima-guestagent /usr/local/bin/lima-guestagent
-umount /mnt/lima-cidata
+install -m 755 "${LIMA_CIDATA_MNT}"/lima-guestagent /usr/local/bin/lima-guestagent
 
 # Launch the guestagent service
 if [ -f /etc/alpine-release ]; then

pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh

@@ -5,10 +5,7 @@ set -eux -o pipefail
 command -v systemctl 2>&1 >/dev/null || exit 0
 
 if [ ! -x /usr/local/bin/nerdctl ]; then
-  mkdir -p -m 600 /mnt/lima-cidata
-  mount -t iso9660 -o ro /dev/disk/by-label/cidata /mnt/lima-cidata
-  tar Cxzf /usr/local /mnt/lima-cidata/nerdctl-full.tgz
-  umount /mnt/lima-cidata
+  tar Cxzf /usr/local "${LIMA_CIDATA_MNT}"/nerdctl-full.tgz
 fi
 {{- if .Containerd.System}}
 mkdir -p /etc/containerd

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

@@ -21,9 +21,7 @@ write_files:
  - content: |
       #!/bin/sh
       set -eu
-      # TODO: rename lima-cidata.boot to lima-cidata,
-      # after deduplicating it in 25-guestagent-base-boot.sh
-      LIMA_CIDATA_MNT="/mnt/lima-cidata.boot"
+      LIMA_CIDATA_MNT="/mnt/lima-cidata"
       LIMA_CIDATA_DEV="/dev/disk/by-label/cidata"
       mkdir -p -m 700 "${LIMA_CIDATA_MNT}"
       mount -o ro,mode=0700,dmode=0700,overriderockperm,exec,uid=0 "${LIMA_CIDATA_DEV}" "${LIMA_CIDATA_MNT}"