releng: add kpartx and wipefs to recovery images

zbm-dev · Dec 22, 2022 · 5b61268 · 5b61268
1 parent b2b4933
commit 5b61268
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/etc/zfsbootmenu/recovery.conf.d/recovery.conf b/etc/zfsbootmenu/recovery.conf.d/recovery.conf
@@ -1,5 +1,8 @@
-# Filesystem manipulation
-install_optional_items+=" /bin/gdisk /bin/parted /bin/mkfs.vfat /bin/mkfs.ext4 "
+# Disk manipulation
+install_optional_items+=" /bin/gdisk /bin/parted /bin/wipefs /bin/kpartx "
+
+# Filesystem creation
+install_optional_items+=" /bin/mkfs.vfat /bin/mkfs.ext4 "
 
 # Boot manipulation
 install_optional_items+=" /bin/efibootmgr "

diff --git a/releng/docker/image-build.sh b/releng/docker/image-build.sh
@@ -106,7 +106,7 @@ buildah run "${container}" \
 buildah run "${container}" xbps-install -y \
   linux5.10 linux5.10-headers gummiboot-efistub curl yq-go bash kbd terminus-font \
   dracut mkinitcpio dracut-network gptfdisk iproute2 iputils parted curl \
-  dosfstools e2fsprogs efibootmgr cryptsetup openssh
+  dosfstools e2fsprogs efibootmgr cryptsetup openssh util-linux kpartx
 
 # Remove headers and development toolchain, but keep binutils for objcopy
 buildah run "${container}" sh -c 'echo "ignorepkg=dkms" > /etc/xbps.d/10-nodkms.conf'