From 639257c77b381b831da99bdb7bc89aba16ce0412 Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Fri, 16 Sep 2022 11:07:30 +0200
Subject: [PATCH] Make path for tcpdump release-specific

In Ubuntu 22.04, the tcpdump binary is in /usr/bin instead of /usr/sbin,
adapt the path selection accordingly.

Needed-By: https://review.opendev.org/857031
Change-Id: Ida08e0ea98fe1b3dc8b4416101897dabc096fbdf
---
 devstack/plugin.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8a4a2dec623..28e80962824 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -117,7 +117,12 @@ if [[ "$1" == "stack" ]]; then
             if is_service_enabled br-ex-tcpdump ; then
                 # tcpdump monitor on br-ex for ARP, reverse ARP and ICMP v4 / v6 packets
                 sudo ip link set dev $PUBLIC_BRIDGE up
-                run_process br-ex-tcpdump "/usr/sbin/tcpdump -i $PUBLIC_BRIDGE arp or rarp or icmp or icmp6 -enlX" "$STACK_GROUP" root
+                if [[ "$os_CODENAME" == "jammy" ]]; then
+                    TCPDUMP=/usr/bin/tcpdump
+                else
+                    TCPDUMP=/usr/sbin/tcpdump
+                fi
+                run_process br-ex-tcpdump "$TCPDUMP -i $PUBLIC_BRIDGE arp or rarp or icmp or icmp6 -enlX" "$STACK_GROUP" root
             fi
 
             if is_service_enabled br-int-flows ; then