Create a mount script instead of editing /etc/fstab

This enables support for mount points that include spaces. `/etc/fstab` normally supports encoding special characters in filenames using octal constants (like "\040` for a space), but that doesn't work on Alpine. Signed-off-by: Jan Dubois <[email protected]> (cherry picked from commit eb3d0b7)
lima-vm · Mar 9, 2024 · 3090e82 · 3090e82
1 parent 68806de
commit 3090e82
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/lima-init.sh b/lima-init.sh
@@ -45,10 +45,10 @@ LIMA_CIDATA_GID=$(id -g "${LIMA_CIDATA_USER}")
 chown -R "${LIMA_CIDATA_UID}:${LIMA_CIDATA_GID}" "${LIMA_CIDATA_SSHDIR}"
 chmod 600 "${LIMA_CIDATA_SSHDIR}"/authorized_keys
 
-# Add mounts to /etc/fstab
-sed -i '/#LIMA-START/,/#LIMA-END/d' /etc/fstab
-echo "#LIMA-START" >> /etc/fstab
-awk -f- "${LIMA_CIDATA_MNT}"/user-data <<'EOF' >> /etc/fstab
+# Process mounts
+MOUNT_SCRIPT=/etc/lima-mounts
+echo "#!/bin/sh -eux" >"${MOUNT_SCRIPT}"
+awk -f- "${LIMA_CIDATA_MNT}"/user-data <<'EOF' >>"${MOUNT_SCRIPT}"
 /^mounts:/ {
     flag = 1
     next
@@ -57,15 +57,17 @@ awk -f- "${LIMA_CIDATA_MNT}"/user-data <<'EOF' >> /etc/fstab
     flag = 0
 }
 flag {
+    # Use a pattern unlikely to appear in a filename. "\0" unfortunately doesn't work.
+    FS = "<;><><;>"
     sub(/^ *- \[/, "")
     sub(/"?\] *$/, "")
-    gsub("\"?, \"?", "\t")
-    print $0
+    gsub("\"?, \"?", FS)
+    printf "mkdir -p \"%s\"\n", $2
+    printf "mount -t %s -o \"%s\" %s \"%s\"\n", $3, $4, $1, $2
 }
 EOF
-echo "#LIMA-END" >> /etc/fstab
-mkmntdirs
-mount -a
+chmod +x "${MOUNT_SCRIPT}"
+"${MOUNT_SCRIPT}"
 
 # Rename network interfaces according to network-config setting
 mkdir -p /var/lib/lima-init