Merge pull request #108 from AkihiroSuda/dev-fix-archlinux-link

examples/archlinux.yaml: use more reliable image URL

Author: AkihiroSuda

examples/archlinux.yaml

@@ -1,7 +1,8 @@
 # This example requires Lima v0.5.0 or later
 arch: "x86_64"
 images:
-  - location: "https://gitlab.archlinux.org/archlinux/arch-boxes/-/jobs/27546/artifacts/raw/output/Arch-Linux-x86_64-cloudimg-20210630.27546.qcow2"
+  # NOTE: the image is periodically rotated, if you face 404, see https://mirror.pkgbuild.com/images/ to find the latest image.
+  - location: "https://mirror.pkgbuild.com/images/v20210619.26314/Arch-Linux-x86_64-cloudimg-20210619.26314.qcow2"
     arch: "x86_64"
 mounts:
   - location: "~"

hack/test-example.sh

@@ -60,14 +60,22 @@ if limactl ls -q | grep -q "$NAME"; then
 	exit 1
 fi
 
+function diagnose() {
+	NAME="$1"
+	set -x +e
+	tail "$HOME/.lima/${NAME}"/*.log
+	limactl shell "$NAME" systemctl status
+	limactl shell "$NAME" systemctl
+	limactl shell "$NAME" sudo cat /var/log/cloud-init-output.log
+	set +x -e
+}
+
 INFO "Starting \"$NAME\" from \"$FILE\""
 trap 'limactl delete -f $NAME' EXIT
 set -x
 if ! limactl start --tty=false "$FILE"; then
 	ERROR "Failed to start \"$NAME\""
-	tail "$HOME/.lima/${NAME}"/*.log
-	limactl shell "$NAME" systemctl status || true
-	limactl shell "$NAME" cat /var/log/cloud-init-output.log || true
+	diagnose "$NAME"
 	exit 1
 fi
 
@@ -93,7 +101,7 @@ if [[ -n ${CHECKS["systemd"]} ]]; then
 	set -x
 	if ! limactl shell "$NAME" systemctl is-system-running --wait; then
 		ERROR '"systemctl is-system-running" failed'
-		limactl shell "$NAME" systemctl
+		diagnose "$NAME"
 		if [[ -z ${CHECKS["systemd-strict"]} ]]; then
 			INFO 'Ignoring "systemctl is-system-running" failure'
 		else

pkg/cidata/cidata.TEMPLATE.d/boot/00-modprobe.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# Load modules as soon as the cloud-init starts up.
+# Because Arch Linux removes kernel module files when the kernel package was updated during running cloud-init :(
+
+set -eu
+for f in \
+	fuse \
+	tun tap \
+	bridge veth \
+	ip_tables ip6_tables iptable_nat ip6table_nat iptable_filter ip6table_filter \
+	nf_tables \
+	x_tables xt_MASQUERADE xt_addrtype xt_comment xt_conntrack xt_mark xt_multiport xt_nat xt_tcpudp \
+	overlay; do
+	echo "Loading kernel module \"$f\""
+	if ! modprobe "$f"; then
+		echo >&2 "Faild to load \"$f\" (negligible if it is built-in the kernel)"
+	fi
+done

pkg/cidata/cidata.TEMPLATE.d/boot/00-alpine-ash-as-bash.sh renamed to pkg/cidata/cidata.TEMPLATE.d/boot/01-alpine-ash-as-bash.sh

@@ -79,7 +79,6 @@ elif command -v apk >/dev/null 2>&1; then
 			apk update
 			apk add sshfs
 		fi
-		modprobe fuse
 	fi
 fi
 

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

@@ -25,8 +25,6 @@ EOF
 fi
 
 if [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
-	modprobe tap || true
-	modprobe ip_tables || true
 	if [ ! -e "/home/${LIMA_CIDATA_USER}.linux/.config/containerd/config.toml" ]; then
 		mkdir -p "/home/${LIMA_CIDATA_USER}.linux/.config/containerd"
 		cat >"/home/${LIMA_CIDATA_USER}.linux/.config/containerd/config.toml" <<EOF