dependency commit

aman-1004 · Jul 19, 2023 · 6e46116 · 6e46116
1 parent ee5346a
commit 6e46116
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 2 deletions.
diff --git a/NfsDiagnostics/nfsclientlogs.sh b/NfsDiagnostics/nfsclientlogs.sh
@@ -8,6 +8,14 @@ TRACE_NFSBPF_ABS_PATH="/opt/xstore/lib/NfsDiagnostics/trace-nfsbpf"
 PYTHON_PROG='python'
 STDLOG_FILE='/dev/null'
 
+
+# to enable backward compatibility.
+_trace_nfsfsbpf_alt_path="$(cd "$(dirname "trace-nfsbpf")" && pwd)/$(basename "trace-nfsbpf")"
+if [[ -f "${_trace_nfsbpf_alt_path}" ]];
+then
+  TRACE_NFSBPF_ABS_PATH="${_trace_nfsbpf_alt_path}"
+fi
+
 main() {
   if [[ "$*" =~ "v3b" ]]
   then

diff --git a/SMBDiagnostics/smbclientlogs.sh b/SMBDiagnostics/smbclientlogs.sh
@@ -9,6 +9,13 @@ PYTHON_PROG='python'
 STDLOG_FILE='/dev/null'
 
 
+# to enable backward compatibility.
+_trace_cifsbpf_alt_path="$(cd "$(dirname "trace-cifsbpf")" && pwd)/$(basename "trace-cifsbpf")"
+if [[ -f "${_trace_cifsbpf_alt_path}" ]];
+then
+  TRACE_CIFSBPF_ABS_PATH="${_trace_cifsbpf_alt_path}"
+fi
+
 main() {
   if [[ "$*" =~ "start" ]]
   then
@@ -118,7 +125,7 @@ capture_network() {
 }
 
 trace_cifsbpf() {
-  /usr/bin/env "${PYTHON_PROG}" "${TRACE_CIFSBPF_ABS_PATH}" "${DIRNAME}" 0<&- 2>&1 &
+  nohup /usr/bin/env "${PYTHON_PROG}" "${TRACE_CIFSBPF_ABS_PATH}" "${DIRNAME}" 0<&- 2>&1 &
 }
 
 stop() {

diff --git a/diag-main.sh b/diag-main.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 
-PACKAGE_TREE="$(dirname $(dirname $(readlink -f $0)))"
+# PACKAGE_TREE="$(dirname $(dirname $(readlink -f $0)))"
+PACKAGE_TREE="/opt/xstore"
 run() {
   if [[ $1 == "nfs" ]] || [[ $1 == "cifs" ]];
   then 

diff --git a/packaging/DEBIAN/control b/packaging/DEBIAN/control
@@ -3,3 +3,4 @@ Version: $VERSION
 Maintainer: Microsoft
 Architecture: all
 Description: Diagnostics scripts for CIFS and NFS. 
+Depends: tcpdump, trace-cmd, rpcdebug
diff --git a/packaging/DEBIAN/preinst b/packaging/DEBIAN/preinst
@@ -0,0 +1 @@
+apt-get -y install bpfcc-tools linux-headers-$(uname -r)
diff --git a/packaging/RPM/spec.spec b/packaging/RPM/spec.spec
@@ -5,10 +5,15 @@ Summary:        Diagnostics scripts for NFS and CIFS
 License:        GPL
 URL:            https://example.com
 
+Requires: tcpdump
+Requires: trace-cmd
+Requires: rpcdebug
+
 %description
 Diagnostics scripts for NFS and CIFS
 
 %prep
+dnf install -y bcc
 
 %install
 # Install script and related files
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		apt-get -y install bpfcc-tools linux-headers-$(uname -r)