From: Laszlo Gombos Date: Thu, 18 May 2023 16:43:38 +0000 (+0000) Subject: ci: re-enable lvm on Gentoo container X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d06153f89666e9741f587408e10fb9983385bfa5;p=thirdparty%2Fdracut.git ci: re-enable lvm on Gentoo container Gentoo changed it's policy and now lvm needs to be enabled explicitly. See https://www.gentoo.org/support/news-items/2022-11-19-lvm2-default-USE-flags.html No need to install thin-provisioning-tools explicitelly, it is pulled in as a dependency of the lvm2 package. --- diff --git a/test/container/Dockerfile-Gentoo b/test/container/Dockerfile-Gentoo index 03f7917ab..96370abb2 100644 --- a/test/container/Dockerfile-Gentoo +++ b/test/container/Dockerfile-Gentoo @@ -25,14 +25,12 @@ COPY --from=efistub /usr/lib/systemd/boot/efi /usr/lib/systemd/boot/efi MAINTAINER https://github.com/dracutdevs/dracut -# Only install `dmsetup`: attempting to install all of lvm2 fails due to missing kernel headers. -RUN echo 'sys-fs/lvm2 device-mapper-only -thin' > /etc/portage/package.use/lvm2 +# required by sys-fs/dmraid +RUN echo '>=sys-fs/lvm2-2.03.20 lvm thin' > /etc/portage/package.use/lvm2 # workaround for https://bugs.gentoo.org/734022 whereby Gentoo does not support NFS4 with musl RUN echo 'net-fs/nfs-utils -nfsv4' > /etc/portage/package.use/nfs-utils -RUN echo '>=sys-fs/lvm2-2.03.17-r1 lvm' > /etc/portage/package.use/dmraid - # Install needed packages for the dracut CI container RUN emerge -qv \ app-arch/cpio \ @@ -44,7 +42,6 @@ RUN emerge -qv \ sys-block/nbd \ sys-block/open-iscsi \ sys-block/parted \ - sys-block/thin-provisioning-tools \ sys-fs/btrfs-progs \ sys-fs/cryptsetup \ sys-fs/dmraid \