From a895887b37f819477e21f07ed6c39633d4b3524b Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Mon, 7 Jul 2025 10:23:14 -0700
Subject: [PATCH 1/2] Add iproute2 package for JSON output from `ip -j a`

Added unconditionally to all editions because in the future Lima will
depend on it (it is also part of the default Alpine cloud image).

Ref https://github.com/lima-vm/lima/pull/3696

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 genapkovl-lima.sh | 1 +
 mkimg.lima.sh     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh
index 9223c4b..49b5e06 100755
--- a/genapkovl-lima.sh
+++ b/genapkovl-lima.sh
@@ -48,6 +48,7 @@ EOF
 mkdir -p "$tmp"/etc/apk
 makefile root:root 0644 "$tmp"/etc/apk/world <<EOF
 alpine-base
+iproute2
 openssh-server-pam
 EOF
 
diff --git a/mkimg.lima.sh b/mkimg.lima.sh
index 0c34cda..9d67442 100755
--- a/mkimg.lima.sh
+++ b/mkimg.lima.sh
@@ -13,7 +13,7 @@ profile_lima() {
 	kernel_cmdline="console=hvc0 console=tty0 console=ttyS0,115200"
 	syslinux_serial="0 115200"
 	apkovl="genapkovl-lima.sh"
-	apks="$apks openssh-server-pam tiny-cloud-nocloud"
+	apks="$apks iproute2 openssh-server-pam tiny-cloud-nocloud"
         if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
             apks="$apks ca-certificates"
         fi

From 79153fefe4d8e8bad592b4a94801ea4d6128cf6d Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Mon, 7 Jul 2025 10:25:39 -0700
Subject: [PATCH 2/2] Minor refactoring

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 Dockerfile        | 2 +-
 genapkovl-lima.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 981d4e6..f10ee24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ARG ALPINE_VERSION=latest
 ARG BINFMT_IMAGE=tonistiigi/binfmt:latest
 
-FROM ${BINFMT_IMAGE} as binfmt
+FROM ${BINFMT_IMAGE} AS binfmt
 
 FROM alpine:${ALPINE_VERSION}
 RUN apk add alpine-sdk build-base apk-tools alpine-conf busybox \
diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh
index 49b5e06..de91c59 100755
--- a/genapkovl-lima.sh
+++ b/genapkovl-lima.sh
@@ -209,6 +209,10 @@ if [ "${LIMA_INSTALL_GIT}" == "true" ]; then
     echo "git" >> "$tmp"/etc/apk/world
 fi
 
+if [ "${LIMA_INSTALL_IPTABLES}" == "true" ]; then
+    echo "iptables ip6tables" >> "$tmp"/etc/apk/world
+fi
+
 if [ "${LIMA_INSTALL_K3S}" == "true" ]; then
     echo "k3s" >> "$tmp"/etc/apk/world
     rc_add k3s default
@@ -218,10 +222,6 @@ if [ "${LIMA_INSTALL_LOGROTATE}" == "true" ]; then
     echo "logrotate" >> "$tmp"/etc/apk/world
 fi
 
-if [ "${LIMA_INSTALL_IPTABLES}" == "true" ]; then
-    echo "iptables ip6tables" >> "$tmp"/etc/apk/world
-fi
-
 if [ "${LIMA_INSTALL_OPENSSH_SFTP_SERVER}" == "true" ]; then
     echo "openssh-sftp-server" >> "$tmp"/etc/apk/world
 fi