From a29ae71e47ba19d456e784229d04948fe285a504 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 24 Sep 2024 16:20:29 +0200
Subject: [PATCH] fix containers running depmod for 6.11 kernels

---
 usr/lib/archboot/container.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh
index aaca7ae32..246f8f774 100644
--- a/usr/lib/archboot/container.sh
+++ b/usr/lib/archboot/container.sh
@@ -107,8 +107,8 @@ _create_pacman_conf() {
             # CDN on aarch64 is broken sometimes
             sd '^Server = http://mirror.archlinuxarm.org/$arch/$repo' \
                '# Server = http://mirror.archlinuxarm.org/$arch/$repo' ${1}/etc/pacman.d/mirrorlist
-            sd '# Server = http://de.mirror.archlinuxarm.org/$arch/$repo' \
-               'Server = http://de.mirror.archlinuxarm.org/$arch/$repo' ${1}/etc/pacman.d/mirrorlist
+            sd '# Server = http://de3.mirror.archlinuxarm.org/$arch/$repo' \
+               'Server = http://de3.mirror.archlinuxarm.org/$arch/$repo' ${1}/etc/pacman.d/mirrorlist
         fi
         if ! rg -qw "\[archboot\]" "${_PACMAN_CONF}"; then
             echo "Adding Archboot repository to ${_PACMAN_CONF}..."
@@ -254,9 +254,11 @@ _container_reproducibility() {
 _set_hostname() {
     echo "Setting hostname to archboot..."
     echo 'archboot' > "${1}/etc/hostname"
+}
 
 _depmod() {
     echo "Running depmod..."
-    ${_NSPAWN} "${1}" depmod $(kver "${1}/${_KERNEL}")
-}
+    _KERNELVERSION="$(_kver $(basename ${1}/lib/modules/*))"
+    ${_NSPAWN} "${1}" depmod "${_KERNELVERSION}"
 }
+