From 718d7b8c2c5be96cb8bb0ad0bfe85df4f48f2bcc Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka@kairos.io>
Date: Mon, 16 Oct 2023 15:26:59 +0200
Subject: [PATCH] Add missing disk utils to alpine initramfs

Signed-off-by: Itxaka <itxaka@kairos.io>
---
 packages/alpine/build.yaml           |  4 ++--
 packages/alpine/collection.yaml      |  4 ++--
 packages/alpine/files/immucore.files | 22 +++++++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/alpine/build.yaml b/packages/alpine/build.yaml
index a61161c44..87daa4ffd 100644
--- a/packages/alpine/build.yaml
+++ b/packages/alpine/build.yaml
@@ -20,7 +20,7 @@ package_dir: "/package"
 prelude:
   - apk update
   # multipath-tools and cryptsetup is needed to bring modules and udev rules
-  - apk add linux-rpi4 linux-firmware-none mkinitfs dbus eudev eudev-hwids mdadm-udev device-mapper-udev lvm2 findmnt rsync parted cryptsetup multipath-tools openrc blkid
+  - apk add linux-rpi4 linux-firmware-none mkinitfs dbus cloud-utils-growpart e2fsprogs e2fsprogs-extra xfsprogs xfsprogs-extra sgdisk eudev eudev-hwids mdadm-udev device-mapper-udev lvm2 findmnt rsync parted cryptsetup multipath-tools openrc blkid
 steps:
   - kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
   - mkdir -p /package/boot
@@ -53,7 +53,7 @@ package_dir: "/package"
 prelude:
   - apk update
   # multipath-tools and cryptsetup is needed to bring modules and udev rules
-  - apk add linux-lts linux-firmware-none mkinitfs dbus eudev eudev-hwids mdadm-udev device-mapper-udev lvm2 findmnt rsync parted cryptsetup multipath-tools openrc blkid
+  - apk add linux-lts linux-firmware-none mkinitfs dbus cloud-utils-growpart e2fsprogs e2fsprogs-extra xfsprogs xfsprogs-extra sgdisk eudev eudev-hwids mdadm-udev device-mapper-udev lvm2 findmnt rsync parted cryptsetup multipath-tools openrc blkid
 steps:
   - kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
   - mkdir -p /package/boot
diff --git a/packages/alpine/collection.yaml b/packages/alpine/collection.yaml
index 170a19a07..2be469fa3 100644
--- a/packages/alpine/collection.yaml
+++ b/packages/alpine/collection.yaml
@@ -1,7 +1,7 @@
 packages:
   - name: "alpine"
     category: "distro-kernel"
-    version: "6.1.56-3"
+    version: "6.1.56-4"
     description: "Provides kernel and custom initrd for alpine"
     labels:
       autobump.strategy: "custom"
@@ -14,7 +14,7 @@ packages:
       package.version: "6.1.56"
   - name: "alpine-rpi"
     category: "distro-kernel"
-    version: "6.1.55-3"
+    version: "6.1.55-4"
     description: "Provides kernel and custom initrd for alpine"
     labels:
       autobump.strategy: "custom"
diff --git a/packages/alpine/files/immucore.files b/packages/alpine/files/immucore.files
index 7093f531d..a92e18038 100644
--- a/packages/alpine/files/immucore.files
+++ b/packages/alpine/files/immucore.files
@@ -1,18 +1,26 @@
-/usr/bin/immucore
-/usr/bin/kairos-agent
-/sbin/lvm
-/sbin/blkid
+/bin/lsblk
 /bin/findmnt
 /bin/udevadm
+/sbin/lvm
+/sbin/blkid
 /sbin/udevadm
 /sbin/udevd
 /sbin/dmsetup
+/sbin/e2fsck
+/sbin/openrc
+/sbin/openrc-run
 /etc/udev/*
 /lib/udev/*
 /usr/lib/udev/*
 /usr/lib/libudev*
+/usr/bin/immucore
+/usr/bin/kairos-agent
 /usr/bin/rsync
+/usr/bin/sgdisk
+/usr/bin/growpart
+/usr/bin/dbus-uuidgen
+/usr/sbin/multipath
 /usr/sbin/parted
-/sbin/openrc
-/sbin/openrc-run
-/usr/bin/dbus-uuidgen
\ No newline at end of file
+/usr/sbin/partprobe
+/usr/sbin/resize2fs
+/usr/sbin/xfs_growfs
\ No newline at end of file