tools: Modifications to copy support bundle files

This commit is to copy the support bundle scripts to appropriate directories during installation Signed-off-by: Sri Mohana Singamsetty <msingamsetty@vmware.com>
LabNConsulting · Sep 13, 2019 · 11c83aa · 11c83aa
1 parent 90316c9
commit 11c83aa
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/debian/frr-pythontools.install b/debian/frr-pythontools.install
@@ -1 +1,2 @@
 usr/lib/frr/frr-reload.py
+usr/lib/frr/generate_support_bundle.py
diff --git a/debian/rules b/debian/rules
@@ -71,6 +71,7 @@ override_dh_auto_install:
 	dh_auto_install
 
 	sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/frr-reload.py
+	sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/generate_support_bundle.py
 
 # let dh_systemd_* and dh_installinit do their thing automatically
 ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
@@ -656,6 +656,9 @@ fi
 
 
 %files pythontools
+%{_sbindir}/generate_support_bundle.py
+%{_sbindir}/generate_support_bundle.pyc
+%{_sbindir}/generate_support_bundle.pyo
 %{_sbindir}/frr-reload.py
 %{_sbindir}/frr-reload.pyc
 %{_sbindir}/frr-reload.pyo

diff --git a/tools/generate_support_bundle.py b/tools/generate_support_bundle.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 ########################################################
 ### Python Script to generate the FRR support bundle ###
 ########################################################

diff --git a/tools/subdir.am b/tools/subdir.am
@@ -16,6 +16,7 @@ sbin_SCRIPTS += \
 	\
 	tools/frrcommon.sh \
 	tools/frrinit.sh \
+	tools/generate_support_bundle.py \
 	tools/watchfrr.sh \
 	# end
 
@@ -35,6 +36,7 @@ EXTRA_DIST += \
 	tools/frr-reload \
 	tools/frr-reload.py \
 	tools/frr.service \
+	tools/generate_support_bundle.py \
 	tools/multiple-bgpd.sh \
 	tools/rrcheck.pl \
 	tools/rrlookup.pl \
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		usr/lib/frr/frr-reload.py
		usr/lib/frr/generate_support_bundle.py