Skip to content
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

fix requirement of modprobe ip_tables #694

Merged
merged 2 commits into from
Jan 4, 2025
Merged

fix requirement of modprobe ip_tables #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d65b46a
fix requirement of modprobe ip_tablesfix requ
dougsland Jan 3, 2025
349d168
setup: Avoid SecurityLabelNested for CentOS <=9
dougsland Jan 3, 2025
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 rpm/qm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: selinux-policy >= %_selinux_policy_version
BuildRequires: selinux-policy-devel >= %_selinux_policy_version

Requires: iptables
Requires: parted
Requires: containers-common
Requires: selinux-policy >= %_selinux_policy_version
Expand Down Expand Up @@ -109,7 +110,7 @@ install -d %{buildroot}%{_sysconfdir}/containers/containers.conf.d
# Execute the script to create seccomp rules after the package is installed
/usr/share/qm/create-seccomp-rules
/usr/share/qm/comment-tz-local # FIX-ME GH-issue: 367
/usr/share/qm/qm-is-ostree
modprobe ip_tables # podmand netavark requires at host to load

%preun
if [ $1 = 0 ]; then
Expand Down
5 changes: 5 additions & 0 deletions setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ install() {
EXTRA_FLAG="--use-host-config"
fi

# SecurityLabelNested not supported so far in CentOS Stream 9 or lower
dougsland marked this conversation as resolved.
Show resolved Hide resolved
if grep -qi "^ID=centos" /etc/os-release && [[ $(grep -oP '^VERSION_ID="\K[0-9]+' /etc/os-release) -le 9 ]]; then
sed -i '/SecurityLabelNested/d' /usr/share/containers/systemd/qm.container
fi

cmd_dnf_install="dnf -y install --releasever=${VERSION_ID} --installroot ${ROOTFS} ${PACKAGES_TO_INSTALL} ${EXTRA_FLAG}"
echo "$cmd_dnf_install"
${cmd_dnf_install}
Expand Down
Loading