Skip to content

fix: load netfilter comment modules for rootless BuildKit on EL10 #5664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvanhorn wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −4
Open

fix: load netfilter comment modules for rootless BuildKit on EL10 #5664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/cidata/cidata.TEMPLATE.d/boot.Linux/00-modprobe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ set -eu

command -v modprobe >/dev/null 2>&1 || exit 0

# iptables-nft needs nft_compat for -m comment: https://github.com/lima-vm/lima/issues/5623
for f in \
fuse \
tun tap \
bridge veth \
ip_tables ip6_tables iptable_nat ip6table_nat iptable_filter ip6table_filter \
nf_tables \
nf_tables nft_compat \
x_tables xt_MASQUERADE xt_addrtype xt_comment xt_conntrack xt_mark xt_multiport xt_nat xt_tcpudp \
overlay; do
echo "Loading kernel module \"$f\""
Expand Down
39 changes: 36 additions & 3 deletions pkg/cidata/cidata.TEMPLATE.d/boot.Linux/30-install-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ if [ "${LIMA_CIDATA_SKIP_DEFAULT_DEPENDENCY_RESOLUTION}" = 1 ]; then
fi

REMOUNT_VIRTIOFS=0
RELOAD_NETFILTER_MODULES=0

if head -c 4 "$(command -v apt-get)" | grep -qP '\x7fELF' >/dev/null 2>&1; then
pkgs=""
Expand Down Expand Up @@ -89,6 +90,26 @@ elif command -v dnf >/dev/null 2>&1; then
if ! command -v rsync >/dev/null 2>&1; then
pkgs="${pkgs} rsync"
fi
# Rootless iptables-nft cannot autoload the comment match: https://github.com/lima-vm/lima/issues/5623
if [ "${INSTALL_IPTABLES}" = 1 ] && command -v modprobe >/dev/null 2>&1; then
if ! modprobe -n xt_comment >/dev/null 2>&1; then
kernel_release="$(uname -r)"
case "${kernel_release}" in
*uek*)
extrapkgs="${extrapkgs} kernel-uek-modules-${kernel_release}"
RELOAD_NETFILTER_MODULES=1
;;
*)
if dnf -q info "kernel-modules-${kernel_release}" >/dev/null 2>&1; then
pkgs="${pkgs} kernel-modules-${kernel_release}"
RELOAD_NETFILTER_MODULES=1
else
echo >&2 "WARNING: kernel-modules-${kernel_release} not found; continuing without it"
fi
;;
esac
fi
fi
if [ -n "${pkgs}" ] || [ -n "${extrapkgs}" ]; then
dnf_install_flags="-y --setopt=install_weak_deps=False"
epel_install_flags=""
Expand Down Expand Up @@ -119,13 +140,21 @@ elif command -v dnf >/dev/null 2>&1; then
epel_install_flags="${epel_install_flags} --enablerepo epel"
fi
if grep -q "Oracle Linux Server" /etc/system-release && [ "${LIMA_CIDATA_MOUNTTYPE}" = "virtiofs" ]; then
# The comment-match path may already have appended this package.
uek_modules_pkg="kernel-uek-modules-$(uname -r)"
if ! echo " ${extrapkgs} " | grep -F -q " ${uek_modules_pkg} "; then
extrapkgs="${extrapkgs} ${uek_modules_pkg}"
fi
REMOUNT_VIRTIOFS=1
fi
case "${extrapkgs}" in
*kernel-uek-modules-*)
# Enable repositories like "ol9_UEKR7"
for repo in $(dnf -q repolist | awk '/UEK/NR>1{print $1}'); do
epel_install_flags="${epel_install_flags} --enablerepo ${repo}"
done
extrapkgs="${extrapkgs} kernel-uek-modules-$(uname -r)"
REMOUNT_VIRTIOFS=1
fi
;;
esac
if [ -n "${pkgs}" ]; then
# shellcheck disable=SC2086
dnf install ${dnf_install_flags} ${pkgs}
Expand Down Expand Up @@ -229,3 +258,7 @@ fi
if [ "${REMOUNT_VIRTIOFS}" = 1 ]; then
mount -t virtiofs -a
fi
if [ "${RELOAD_NETFILTER_MODULES}" = 1 ]; then
# Load xt_comment and nft_compat before rootless BuildKit starts.
"${LIMA_CIDATA_MNT}/boot.Linux/00-modprobe.sh"
fi
Loading