Skip to content

Commit

Permalink
chore(ci): Drop cliwrap
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleGospo committed Nov 21, 2024
1 parent 63817ac commit fffd29d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -177,18 +177,14 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
ostree container commit

# Install kernel
# For some reason, replacing the kernel makes it so a %post hook fails when using rpm-ostree cliwrap
# https://github.com/coreos/rpm-ostree/issues/4938
RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
--mount=type=bind,from=kernel,src=/tmp/rpms,dst=/tmp/kernel-rpms \
rpm-ostree cliwrap install-to-root / && \
echo "Will install ${KERNEL_FLAVOR} kernel" && \
dnf5 -y install \
/tmp/kernel-rpms/kernel-[0-9]*.rpm \
/tmp/kernel-rpms/kernel-core-*.rpm \
/tmp/kernel-rpms/kernel-modules-*.rpm \
/tmp/kernel-rpms/kernel-uki-virt-*.rpm && \
cp /usr/bin/systemctl.backup /usr/bin/systemctl && \
dnf5 -y install \
scx-scheds && \
/usr/libexec/containerbuild/cleanup.sh && \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ else
fi

QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(|'"$KERNEL_SUFFIX"'-)(\d+\.\d+\.\d+)' | sed -E 's/kernel-(|'"$KERNEL_SUFFIX"'-)//')"
/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible --zstd -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible --zstd -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"

chmod 0600 /lib/modules/$QUALIFIED_KERNEL/initramfs.img

0 comments on commit fffd29d

Please sign in to comment.