Skip to content

Commit 5b61268

Browse files
committed
releng: add kpartx and wipefs to recovery images
1 parent b2b4933 commit 5b61268

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

etc/zfsbootmenu/recovery.conf.d/recovery.conf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# Filesystem manipulation
2-
install_optional_items+=" /bin/gdisk /bin/parted /bin/mkfs.vfat /bin/mkfs.ext4 "
1+
# Disk manipulation
2+
install_optional_items+=" /bin/gdisk /bin/parted /bin/wipefs /bin/kpartx "
3+
4+
# Filesystem creation
5+
install_optional_items+=" /bin/mkfs.vfat /bin/mkfs.ext4 "
36

47
# Boot manipulation
58
install_optional_items+=" /bin/efibootmgr "

releng/docker/image-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ buildah run "${container}" \
106106
buildah run "${container}" xbps-install -y \
107107
linux5.10 linux5.10-headers gummiboot-efistub curl yq-go bash kbd terminus-font \
108108
dracut mkinitcpio dracut-network gptfdisk iproute2 iputils parted curl \
109-
dosfstools e2fsprogs efibootmgr cryptsetup openssh
109+
dosfstools e2fsprogs efibootmgr cryptsetup openssh util-linux kpartx
110110

111111
# Remove headers and development toolchain, but keep binutils for objcopy
112112
buildah run "${container}" sh -c 'echo "ignorepkg=dkms" > /etc/xbps.d/10-nodkms.conf'

0 commit comments

Comments
 (0)