From ba4767a995c7c23ff55f52a275db06f1f18c9616 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Fri, 14 Oct 2022 14:43:04 -0700 Subject: [PATCH] Add e2fsprogs-extra to get resize2fs This will be needed to grow the filesystem of mounted volumes when their max image size has been increased. Signed-off-by: Jan Dubois --- edition/ci | 1 + edition/k3s | 1 + edition/min | 1 + edition/rd | 1 + edition/std | 1 + genapkovl-lima.sh | 4 ++++ mkimg.lima.sh | 3 +++ 7 files changed, 12 insertions(+) diff --git a/edition/ci b/edition/ci index a4bd937..7d97e6d 100644 --- a/edition/ci +++ b/edition/ci @@ -1,4 +1,5 @@ source edition/min LIMA_INSTALL_CLOUD_INIT=true +LIMA_INSTALL_E2FSPROGS_EXTRA=true LIMA_INSTALL_GIT=true LIMA_INSTALL_OPENSSH_SFTP_SERVER=true diff --git a/edition/k3s b/edition/k3s index 4587d66..d3b65d6 100644 --- a/edition/k3s +++ b/edition/k3s @@ -1,5 +1,6 @@ source edition/min LIMA_INSTALL_CLOUD_INIT=true +LIMA_INSTALL_E2FSPROGS_EXTRA=true LIMA_INSTALL_GIT=true LIMA_INSTALL_K3S=true LIMA_INSTALL_LOGROTATE=true diff --git a/edition/min b/edition/min index 7b77d2a..4f918dc 100644 --- a/edition/min +++ b/edition/min @@ -5,6 +5,7 @@ export LIMA_INSTALL_CNI_PLUGINS=false export LIMA_INSTALL_CNI_PLUGIN_FLANNEL=false export LIMA_INSTALL_CURL=false export LIMA_INSTALL_DOCKER=false +export LIMA_INSTALL_E2FSPROGS_EXTRA=false export LIMA_INSTALL_GIT=false export LIMA_INSTALL_K3S=false export LIMA_INSTALL_CRI_DOCKERD=false diff --git a/edition/rd b/edition/rd index e41df71..c0df4fa 100644 --- a/edition/rd +++ b/edition/rd @@ -6,6 +6,7 @@ LIMA_INSTALL_CNI_PLUGIN_FLANNEL=true LIMA_INSTALL_CURL=true LIMA_INSTALL_DOCKER=true LIMA_INSTALL_CRI_DOCKERD=true +LIMA_INSTALL_E2FSPROGS_EXTRA=true LIMA_INSTALL_GIT=true LIMA_INSTALL_IPTABLES=true LIMA_INSTALL_LIMA_INIT=true diff --git a/edition/std b/edition/std index 0f25eaa..e5016a0 100644 --- a/edition/std +++ b/edition/std @@ -2,6 +2,7 @@ source edition/min LIMA_INSTALL_LIMA_INIT=true LIMA_INSTALL_BINFMT_MISC=true LIMA_INSTALL_CA_CERTIFICATES=true +LIMA_INSTALL_E2FSPROGS_EXTRA=true LIMA_INSTALL_GIT=true LIMA_INSTALL_IPTABLES=true LIMA_INSTALL_LOGROTATE=true diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh index 4c94862..bfe9b2a 100755 --- a/genapkovl-lima.sh +++ b/genapkovl-lima.sh @@ -224,6 +224,10 @@ if [ "${LIMA_INSTALL_CURL}" == "true" ]; then echo "curl" >> "$tmp"/etc/apk/world fi +if [ "${LIMA_INSTALL_E2FSPROGS_EXTRA}" == "true" ]; then + echo "e2fsprogs-extra" >> "$tmp"/etc/apk/world +fi + if [ "${LIMA_INSTALL_GIT}" == "true" ]; then echo "git" >> "$tmp"/etc/apk/world fi diff --git a/mkimg.lima.sh b/mkimg.lima.sh index 4e80f8d..2b45adb 100755 --- a/mkimg.lima.sh +++ b/mkimg.lima.sh @@ -29,6 +29,9 @@ profile_lima() { if [ "${LIMA_INSTALL_CURL}" == "true" ]; then apks="$apks curl" fi + if [ "${LIMA_INSTALL_E2FSPROGS_EXTRA}" == "true" ]; then + apks="$apks e2fsprogs-extra" + fi if [ "${LIMA_INSTALL_GIT}" == "true" ]; then apks="$apks git" fi