From 11c83aa48a02486b19bc9f863a859859110e0a42 Mon Sep 17 00:00:00 2001
From: Sri Mohana Singamsetty <msingamsetty@vmware.com>
Date: Tue, 13 Aug 2019 14:53:08 -0700
Subject: [PATCH] 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>
---
 debian/frr-pythontools.install   | 1 +
 debian/rules                     | 1 +
 redhat/frr.spec.in               | 3 +++
 tools/generate_support_bundle.py | 2 ++
 tools/subdir.am                  | 2 ++
 5 files changed, 9 insertions(+)
 mode change 100644 => 100755 tools/generate_support_bundle.py

diff --git a/debian/frr-pythontools.install b/debian/frr-pythontools.install
index 28140382f6..5f7eaebed5 100644
--- 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
index a546f38d70..c8550ecb52 100755
--- 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
index fa0a6d8a0a..b3f9ac7630 100644
--- 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
old mode 100644
new mode 100755
index 118ca113a5..c9ca9c3d0d
--- 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
index 7713bb1ade..c637db6eb1 100644
--- 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 \