Add kernel-debug-core and kernel-debug-modules-core to silverblue-sha…

…red-downloader-kernel-cache.
twiest · Jul 28, 2024 · 0b100f5 · 0b100f5
1 parent fccaebb
commit 0b100f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/silverblue-shared-downloader-kernel-cache/files/download-kernels.sh b/silverblue-shared-downloader-kernel-cache/files/download-kernels.sh
@@ -39,7 +39,7 @@ dnf download -y "${kernel_headers_pkg_base}/kernel-headers-${kernel_headers_vers
 
 # Download the rest of the kernel packages
 kernel_pkg_base="https://kojipkgs.fedoraproject.org/packages/kernel/${kernel_major}.${kernel_minor}.${kernel_patch}/${kernel_distro_magic}.${kernel_distro}/${kernel_arch}"
-for pkg in kernel kernel-modules kernel-modules-core kernel-modules-extra kernel-devel kernel-devel-matched kernel-uki-virt; do
+for pkg in kernel kernel-modules kernel-modules-core kernel-modules-extra kernel-devel kernel-devel-matched kernel-uki-virt kernel-debug-core kernel-debug-modules-core; do
   echo "Running: dnf download -y ${kernel_pkg_base}/${pkg}-$kernel_version.rpm"
   dnf download -y "${kernel_pkg_base}/${pkg}-$kernel_version.rpm"
   echo

diff --git a/silverblue-zfs-base/Containerfile b/silverblue-zfs-base/Containerfile
@@ -3,6 +3,9 @@ FROM ghcr.io/twiest/silverblue-shared-downloader-kernel-cache:latest as rpms
 
 FROM quay.io/fedora/fedora-silverblue:40
 
+# Save old kernel version
+RUN rpm -qa kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}' > /old_kernel_version.txt
+
 # Remove current kernel (nice way, then ugly way)
 RUN rpm-ostree uninstall kernel-modules-core kernel-core kernel-modules kernel kernel-modules-extra && \
     rpm -evh --nodeps kernel-debug-core kernel-debug-modules-core && \
@@ -62,7 +65,7 @@ RUN echo 'add_dracutmodules+=" zfs "' > /etc/dracut.conf.d/zfs.conf && \
     echo 'force_drivers+=" zfs "' >> /etc/dracut.conf.d/zfs.conf
 
 # Run dracut to build a new initrd
-RUN export KERNEL_VERSION="$(rpm -qa kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" && \
+RUN export KERNEL_VERSION="$(cat /old_kernel_version.txt)" && \
     stock_arguments=$(lsinitrd "/lib/modules/${KERNEL_VERSION}/initramfs.img"  | grep '^Arguments: ' | sed 's/^Arguments: //') && \
     mkdir -p /var/tmp /tmp/dracut /var/roothome && \
     bash <(/usr/bin/echo "dracut $stock_arguments") && \