debian: Remove /usr/bin/quagga from distribution

We've decided to remove /usr/bin/quagga from
the quagga packaging.  It was only going
to confuse the end user.

Ticket: CM-10456
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>

diff --git a/debian/bgpd.service b/debian/bgpd.service
index 6fb9560d68276581f6c81e80daf83ab9c2f4313f..5475dd7013cc38a7b30a8faee874dd92fdfe5313 100644 (file)
--- a/debian/bgpd.service
+++ b/debian/bgpd.service
@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/bgpd $BGPD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/bgpd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/bgpd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/bgpd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

diff --git a/debian/isisd.service b/debian/isisd.service
index 444d60f5f4c1fbdfc24ec81ec1c30355be398949..04404fc2661a84df3469dfd38d1d56a2116212d5 100644 (file)
--- a/debian/isisd.service
+++ b/debian/isisd.service
@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/isisd $ISISD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/bin/touch /var/run/quagga/isisd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/isisd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/isisd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

diff --git a/debian/ospf6d.service b/debian/ospf6d.service
index 890fd0d8370a36d774cdfd4797f7ea9b64c88da3..3c5b8a050c98f70d45412567ee14ce348b4cbbf0 100644 (file)
--- a/debian/ospf6d.service
+++ b/debian/ospf6d.service
@@ -16,7 +16,6 @@ RestartSec=5
 Restart=on-abnormal
 ExecStart=/usr/lib/quagga/ospf6d $OSPF6D_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b  -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/ospf6d.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospf6d.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospf6d.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

diff --git a/debian/ospfd.service b/debian/ospfd.service
index e83cebe3c1425a3d41e15c6e9be6231c332f3ed2..157d05b07b0ec474ffedd382dbba019f77515329 100644 (file)
--- a/debian/ospfd.service
+++ b/debian/ospfd.service
@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b  -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/ospfd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospfd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospfd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

diff --git a/debian/ospfd@.service b/debian/ospfd@.service
index 1b25e0f4b28c2c7a2638f65db19c8930d50b785f..f23e83a06c746219eba6610431ff914e66f5a3ac 100644 (file)
--- a/debian/ospfd@.service
+++ b/debian/ospfd@.service
@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS -n %I
 ExecStartPost=/usr/bin/vtysh -b  -n
-ExecStopPost=-/bin/touch /var/run/quagga/ospfd@%I.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospfd@%I.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospfd@%I.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

diff --git a/debian/quagga.install b/debian/quagga.install
index 38f6a770f51578570724fa1c59f4edb09d04d6dd..cbec92ca649b069b86c8ae067425a28291242dda 100644 (file)
--- a/debian/quagga.install
+++ b/debian/quagga.install
@@ -3,7 +3,6 @@ usr/bin/vtysh
 usr/include/quagga/
 usr/lib/
 tools/quagga-reload.py usr/lib/quagga/
-tools/quagga usr/bin
 usr/share/doc/quagga/
 usr/share/man/man1/vtysh.1
 usr/share/man/man1/quagga.1

diff --git a/debian/ripd.service b/debian/ripd.service
index f70a316f51ffac1d266b4fccb4cfdcabc6679321..f9c904df300e7e2adbc2bb144ff59837382b323c 100644 (file)
--- a/debian/ripd.service
+++ b/debian/ripd.service
@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ripd $RIPD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/ripd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ripd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ripd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

diff --git a/debian/ripngd.service b/debian/ripngd.service
index 48878a645c36d8db099be7062ac28ab07c973c14..448a7999a5733e0d091c141cd91e383099f2378e 100644 (file)
--- a/debian/ripngd.service
+++ b/debian/ripngd.service
@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ripngd $RIPNGD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/bin/touch /var/run/quagga/ripngd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ripngd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ripngd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

diff --git a/debian/zebra.service b/debian/zebra.service
index 42b1d81fab15eafcb4950c7a4781a3bdf5e8d47c..9d8634c30d5bb0327054fc1ee538ec81fab2f84d 100644 (file)
--- a/debian/zebra.service
+++ b/debian/zebra.service
@@ -16,7 +16,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/zebra $ZEBRA_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/zebra.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/zebra.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/zebra.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf