Packaging

NfsDiagnostics/nfsclientlogs.sh

@@ -23,7 +23,7 @@ main() {
   then
     stop 0<&- > "${STDLOG_FILE}" 2>&1
   else
-    echo "Usage: ./nfsclientlogs.sh <v3b | v4> <> <start | stop> <CaptureNetwork> <OnAnomaly>"
+    echo "Usage: diag-main.sh nfs <v3b | v4> <start | stop> <CaptureNetwork> <OnAnomaly>"
     exit 1
   fi
 

NfsDiagnostics/trace-nfsbpf

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 from bcc import BPF
 from bcc.utils import printb
 from time import sleep

SMBDiagnostics/smbclientlogs.sh

@@ -16,7 +16,7 @@ main() {
   then
     stop 0<&- > "${STDLOG_FILE}" 2>&1
   else
-    echo "Usage: ./smbclientlogs.sh <start | stop> <CaptureNetwork>"
+    echo "Usage: diag-main.sh cifs <start | stop> <CaptureNetwork> <OnAnomaly>"
     exit 1
   fi
 

SMBDiagnostics/trace-cifsbpf

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 from bcc import BPF
 from bcc.utils import printb
 from time import sleep

diag-main.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/bash
+
+PACKAGE_TREE="$(dirname $(dirname $(readlink -f $0)))"
+run() {
+  if [[ $1 == "nfs" ]] || [[ $1 == "cifs" ]];
+  then 
+    if [[ $1 == "nfs" ]]
+    then script_path="${PACKAGE_TREE}/lib/NfsDiagnostics/nfsclientlogs.sh"
+    else script_path="${PACKAGE_TREE}/lib/SMBDiagnostics/smbclientlogs.sh"
+    fi
+    $script_path "$@"
+
+  else 
+    echo "Usage: diag-main.sh <cifs | nfs> <start | stop> [Version] [CaptureNetwork] [OnAnomaly]" >&2
+  fi
+}
+
+run "$@"

packaging/DEBIAN/control

@@ -0,0 +1,5 @@
+Package: $PKG_NAME
+Version: $VERSION
+Maintainer: Microsoft
+Architecture: all
+Description: Diagnostics scripts for CIFS and NFS. 

packaging/DEBIAN/postinst

@@ -0,0 +1,3 @@
+
+chown root:root $SYS_DIR/bin/diag-main.sh
+chmod 454 $SYS_DIR/bin/diag-main.sh

packaging/DEBIAN/postrm

@@ -0,0 +1 @@
+rm -rf $SYS_DIR

packaging/Makefile

@@ -0,0 +1,44 @@
+export PKG_NAME=azure-files-diag
+export RELEASE=1
+export VERSION=1
+export SYS_DIR=/opt/xstore
+export SRC_DIR=..
+# export PKG_BUILD=$(PKG_NAME)$(sles)-$(RELEASE)-1.x86_64
+# export PKG_DIR=BUILDROOT/$(PKG_BUILD)
+export PKG_DIR=$(PKG_NAME)
+export DEB_PKG_DIR=$(PKG_DIR)/DEBIAN
+export OPT_DIR=$(PKG_DIR)$(SYS_DIR)
+
+build: init debian rpm clean 
+	echo "Building deb and rpm packages"
+
+init: 
+	mkdir -p $(OPT_DIR)/bin 
+	mkdir -p $(OPT_DIR)/lib
+	cp -r ../NfsDiagnostics $(OPT_DIR)/lib
+	cp -r ../SMBDiagnostics $(OPT_DIR)/lib
+	cp -r ../diag-main.sh $(OPT_DIR)/bin
+
+debian: init 
+	cp -r ./DEBIAN ./$(PKG_DIR)
+	for file in ./$(PKG_DIR)/DEBIAN/*; do \
+		sed -i "s/\$$PKG_NAME/${PKG_NAME}/g" $$file; \
+		sed -i "s:\$$SYS_DIR:${SYS_DIR}:g"  $$file; \
+		sed -i "s/\$$VERSION/${VERSION}/g" $$file; \
+	done
+	dpkg-deb --build ./$(PKG_DIR)
+
+rpm: init
+	mkdir -p ~/rpmbuild/SOURCES
+	cp -r $(PKG_DIR)/opt ~/rpmbuild/SOURCES
+	cp ./RPM/spec.spec .
+	sed -i "s:\$$SYS_DIR:${SYS_DIR}:g" spec.spec
+	sed -i "s:\$$PKG_NAME:${PKG_NAME}:g" spec.spec
+	sed -i "s:\$$VERSION:${VERSION}:g" spec.spec
+	sed -i "s:\$$RELEASE:${RELEASE}:g" spec.spec
+	rpmbuild -bb spec.spec
+	mv ~/rpmbuild/RPMS/x86_64/*.rpm .
+	rm -r ~/rpmbuild
+
+clean:
+	rm -rf ./$(PKG_DIR) spec.spec

packaging/README.md

@@ -0,0 +1,8 @@
+Run `make` to generate both .deb and .rpm packages and clean the build directories or individually run the following:
+
+- Run `make debian` to generate .deb package
+- Run `make rpm` to generate .rpm package
+- Run `make clean` once the packages are created.
+
+Edit `DEBIAN/control` and `RPM/spec.spec` files to change package description or maintainer information. \
+Edit `Makefile` to make changes to PKG_NAME, RELEASE or VERSION, etc.

packaging/RPM/spec.spec

@@ -0,0 +1,35 @@
+Name:           $PKG_NAME
+Version:        $VERSION
+Release:        $RELEASE
+Summary:        Diagnostics scripts for NFS and CIFS
+License:        GPL
+URL:            https://example.com
+
+%description
+Diagnostics scripts for NFS and CIFS
+
+%prep
+
+%install
+# Install script and related files
+# install -m 454 ~/opt/xstore/bin/diag-main.sh %{buildroot}/opt/xstore/bin/diag-main.sh 
+cp -r ~/rpmbuild/SOURCES/opt %{buildroot}
+echo %{buildroot}
+
+%post 
+chmod 454 $SYS_DIR/bin/diag-main.sh
+
+%files
+# List all the files that are part of the package
+# /opt/xstore/bin/diag-main.sh
+$SYS_DIR/bin/diag-main.sh
+$SYS_DIR/lib/NfsDiagnostics/README
+$SYS_DIR/lib/NfsDiagnostics/nfsclientlogs.sh
+$SYS_DIR/lib/NfsDiagnostics/trace-nfsbpf
+$SYS_DIR/lib/SMBDiagnostics/README
+$SYS_DIR/lib/SMBDiagnostics/smbclientlogs.sh
+$SYS_DIR/lib/SMBDiagnostics/trace-cifsbpf
+%changelog
+
+%postun
+rm -r $SYS_DIR