Merge pull request #890 from AkihiroSuda/opensuse-15.4

templates: update openSUSE Leap to 15.4

Author: AkihiroSuda

examples/opensuse.yaml

@@ -1,7 +1,7 @@
 # This example requires Lima v0.7.0 or later
 images:
 # Hint: run `limactl prune` to invalidate the "Current" cache
-- location: https://download.opensuse.org/distribution/leap/15.3/appliances/openSUSE-Leap-15.3-JeOS.x86_64-15.3-OpenStack-Cloud-Current.qcow2
+- location: https://download.opensuse.org/distribution/leap/15.4/appliances/openSUSE-Leap-15.4-JeOS.x86_64-15.4-OpenStack-Cloud-Current.qcow2
   arch: "x86_64"
 # No aarch64 OpenStack build found :(
 mounts:

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

@@ -2,10 +2,14 @@
 set -eux
 
 update_fuse_conf() {
-	# Modify /etc/fuse.conf to allow "-o allow_root"
+	# Modify /etc/fuse.conf (/etc/fuse3.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
+		fuse_conf="/etc/fuse.conf"
+		if [ -e /etc/fuse3.conf ]; then
+			fuse_conf="/etc/fuse3.conf"
+		fi
+		if ! grep -q "^user_allow_other" "${fuse_conf}"; then
+			echo "user_allow_other" >>"${fuse_conf}"
 		fi
 	fi
 }

pkg/hostagent/requirements.go

@@ -104,15 +104,15 @@ A possible workaround is to run "apt-get install sshfs" in the guest.
 `,
 		})
 		req = append(req, requirement{
-			description: "/etc/fuse.conf to contain \"user_allow_other\"",
+			description: "/etc/fuse.conf (/etc/fuse3.conf) to contain \"user_allow_other\"",
 			script: `#!/bin/bash
 set -eux -o pipefail
-if ! timeout 30s bash -c "until grep -q ^user_allow_other /etc/fuse.conf; do sleep 3; done"; then
-	echo >&2 "/etc/fuse.conf is not updated to contain \"user_allow_other\""
+if ! timeout 30s bash -c "until grep -q ^user_allow_other /etc/fuse*.conf; do sleep 3; done"; then
+	echo >&2 "/etc/fuse.conf (/etc/fuse3.conf) is not updated to contain \"user_allow_other\""
 	exit 1
 fi
 `,
-			debugHint: `Append "user_allow_other" to /etc/fuse.conf in the guest`,
+			debugHint: `Append "user_allow_other" to /etc/fuse.conf (/etc/fuse3.conf) in the guest`,
 		})
 
 	}