[5/5] travis/fedora: install the kmod package

Submitted by Andrei Vagin on Jan. 2, 2019, 7:06 a.m.

Details

Message ID 20190102070642.27270-6-avagin@gmail.com
State Accepted
Series "travix: a few fixes for docker and fedora jobs"
Headers show

Commit Message

Andrei Vagin Jan. 2, 2019, 7:06 a.m.
This patch fixes the error:

(00.074175) Error (criu/net.c:2638): Locking network failed:
iptables-restore returned -1. This may be connected to disabled
CONFIG_NETFILTER_XT_MARK kernel build config option.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/build/Dockerfile.fedora.tmpl | 3 ++-
 scripts/travis/Makefile              | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index de45fd8cb..616b9ec42 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -33,7 +33,8 @@  RUN dnf install -y \
 	tar \
 	which \
 	e2fsprogs \
-	asciidoc xmlto
+	asciidoc xmlto \
+	kmod
 
 # Replace coreutils-single with "traditional" coreutils
 # to fix the following error on Fedora 28/rawhide while
diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
index 07c46fa48..77c937432 100644
--- a/scripts/travis/Makefile
+++ b/scripts/travis/Makefile
@@ -30,7 +30,6 @@  $(TARGETS):
 	docker run --env-file docker.env --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ scripts/travis/travis-tests
 
 fedora-asan:
-	ip6tables -L -n
 	echo "$$DOCKER_JSON" > /etc/docker/daemon.json
 	systemctl restart docker
 	$(MAKE) -C ../build $@$(target-suffix)