Merge branch 'latest' into net

Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>

.gitignore

@@ -0,0 +1 @@
+/.home/

Dockerfile

@@ -72,9 +72,8 @@ RUN cd /opt && \
 	rm -rf "sparse"
 
 # iproute
-ARG IPROUTE2_GIT_URL="https://git.kernel.org/pub/scm/network/iproute2/iproute2.git"
-ARG IPROUTE2_GIT_SHA="v6.8.0"
-ENV IPROUTE2_GIT_SHA="${IPROUTE2_GIT_SHA}"
+ARG IPROUTE2_GIT_URL="https://github.com/multipath-tcp/iproute2.git"
+ARG IPROUTE2_GIT_SHA="591f0654c8980c6c516152b3cf19b814451f3301" # next + last time counters
 RUN cd /opt && \
 	git clone "${IPROUTE2_GIT_URL}" iproute2 && \
 	cd iproute2 && \

entrypoint.sh

@@ -258,17 +258,11 @@ check_last_iproute() { local last curr
 	log_section_start "Check IPRoute2 version"
 
 	last="$(_get_last_iproute_version)"
-
-	if [[ "${IPROUTE2_GIT_SHA}" == "v"* ]]; then
-		curr="${IPROUTE2_GIT_SHA}"
-		if [ "${curr}" = "${last}" ]; then
-			printinfo "IPRoute2: using the last version: ${last}"
-		else
-			printerr "WARN: IPRoute2: not the last version: ${curr} < ${last}"
-		fi
+	curr="v$(ip -V | sed 's/.*iproute2-\([0-9.]\+\).*/\1/')"
+	if [ "${curr}" = "${last}" ]; then
+		printinfo "IPRoute2: using the last version: ${last}"
 	else
-		printerr "TODO: check ip -V"
-		exit 1
+		printerr "WARN: IPRoute2: not the last version: ${curr} < ${last}"
 	fi
 
 	log_section_end

run.sh

@@ -7,10 +7,13 @@ VIRTME_INTERACTIVE=""
 # host is different if worktree are used
 VIRTME_GIT_DIR="$(realpath "$(git rev-parse --git-common-dir)")"
 
+HOME_DIR="$(realpath "$(dirname "${0}")/.home")"
+
 docker run \
 	-v "${PWD}:${PWD}:rw" \
 	-v "${VIRTME_GIT_DIR}:${VIRTME_GIT_DIR}:ro" \
 	${VIRTME_PACKETDRILL_PATH:+-v "${VIRTME_PACKETDRILL_PATH}:/opt/packetdrill:rw"} \
+	-v "${HOME_DIR}:/root" \
 	-w "${PWD}" \
 	-e "INPUT_TRACE" \
 	-e "INPUT_NO_BLOCK" \