cidata: update /etc/fuse.conf earlier

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

Author: AkihiroSuda

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

@@ -1,13 +1,23 @@
 #!/bin/sh
 set -eux
 
+update_fuse_conf(){
+  # Modify /etc/fuse.conf to allow "-o allow_root"
+  if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
+    if ! grep -q "^user_allow_other" /etc/fuse.conf ; then
+      echo "user_allow_other" >> /etc/fuse.conf
+    fi
+  fi
+}
+
 # Install minimum dependencies
 if command -v apt-get 2>&1 >/dev/null; then
   DEBIAN_FRONTEND=noninteractive
   export DEBIAN_FRONTEND
   apt-get update
   if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
     apt-get install -y sshfs
+    update_fuse_conf
   fi
   if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ] || [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
     apt-get install -y iptables
@@ -18,6 +28,7 @@ if command -v apt-get 2>&1 >/dev/null; then
 elif command -v dnf 2>&1 >/dev/null; then
   if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
     dnf install -y fuse-sshfs
+    update_fuse_conf
   fi
   if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ] || [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
     dnf install -y iptables
@@ -35,13 +46,8 @@ elif command -v apk 2>&1 >/dev/null; then
       apk update
       apk add sshfs
     fi
+    update_fuse_conf
     modprobe fuse
   fi
 fi
-# Modify /etc/fuse.conf to allow "-o allow_root"
 
-if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
-  if ! grep -q "^user_allow_other" /etc/fuse.conf ; then
-    echo "user_allow_other" >> /etc/fuse.conf
-  fi
-fi