mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

podman, slirp4netns.sh: Use --netns option on pasta's command line

Browse source 
...instead of PATH. This seems to be the only change needed in
existing pasta integrations after patch:

  Use explicit --netns option rather than multiplexing with PID

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2022-08-29 21:09:37 +02:00
parent b6742d173c
commit 0cb795e432
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/podman/0001-libpod-Add-pasta-networking-mode.patch
View file

@ -1,4 +1,4 @@
From 9f61d4107f7cce5fb4157e18c67fad9c135d7b9f Mon Sep 17 00:00:00 2001 From 321b58cf7e9eadb6073c286ed6709747770f5964 Mon Sep 17 00:00:00 2001
From: Stefano Brivio <sbrivio@redhat.com> From: Stefano Brivio <sbrivio@redhat.com>
Date: Mon, 2 May 2022 16:12:07 +0200 Date: Mon, 2 May 2022 16:12:07 +0200
Subject: [PATCH] libpod: Add pasta networking mode Subject: [PATCH] libpod: Add pasta networking mode
@ -354,7 +354,7 @@ index c10c3c0b2..0f0c1213c 100644
} }
diff --git a/libpod/networking_pasta.go b/libpod/networking_pasta.go diff --git a/libpod/networking_pasta.go b/libpod/networking_pasta.go
new file mode 100644 new file mode 100644
index 000000000..66f81cbfc index 000000000..f179c803a
--- /dev/null --- /dev/null
+++ b/libpod/networking_pasta.go +++ b/libpod/networking_pasta.go
@@ -0,0 +1,107 @@ @@ -0,0 +1,107 @@
@ -452,7 +452,7 @@ index 000000000..66f81cbfc
+ cmdArgs = append(cmdArgs, "-U", "none") + cmdArgs = append(cmdArgs, "-U", "none")
+ } + }
+ +
+ cmdArgs = append(cmdArgs, netns.Path()) + cmdArgs = append(cmdArgs, "--netns", netns.Path())
+ +
+ logrus.Debugf("pasta arguments: %s", strings.Join(cmdArgs, " ")) + logrus.Debugf("pasta arguments: %s", strings.Join(cmdArgs, " "))
+ +

2
slirp4netns.sh
View file

@ -121,7 +121,7 @@ opt() {
# start() - Start pasta # start() - Start pasta
start() { start() {
${PASTA} ${PASTA_OPTS} ${PORT_ARGS} ${ns_spec} ${PASTA} ${PASTA_OPTS} ${PORT_ARGS} --netns ${ns_spec}
[ ${RFD} -ne 0 ] && echo "1" >&${RFD} || : [ ${RFD} -ne 0 ] && echo "1" >&${RFD} || :
} }