debian: Fixup removal of .pid and .vty files

The <daemon>.pid and <daemon>.vty files were not being
removed on shutdown.  This was causing issues w/
logrotate becaue it depends on pid files being correct
about what is running in order to not error out.

Fixed some additional debugs accidently left in the quagga
script.

Ticket: CM-9293
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>

diff --git a/debian/bgpd.service b/debian/bgpd.service
index ace3ba5582d17aee709ff1bc89a27b52fb850715..2ef0081427560fa344753da718bad7b53af27b69 100644 (file)
--- a/debian/bgpd.service
+++ b/debian/bgpd.service
@@ -17,6 +17,8 @@ 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=-/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
 [Install]
 WantedBy=network-online.target

diff --git a/debian/isisd.service b/debian/isisd.service
index c86804118ddb1d6df1a4b469deb245df53ff6679..001a72d2954e5138d9a5930c26465c5d03ae7fa8 100644 (file)
--- a/debian/isisd.service
+++ b/debian/isisd.service
@@ -17,6 +17,8 @@ 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/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
 [Install]
 WantedBy=network-online.target

diff --git a/debian/ospf6d.service b/debian/ospf6d.service
index 95c237da9b5b3780c82ba092f9972b9bf6b63687..c3966d4fa15a6078b1e19a8be616a7adbd3eaed0 100644 (file)
--- a/debian/ospf6d.service
+++ b/debian/ospf6d.service
@@ -16,6 +16,8 @@ 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=-/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
 [Install]
 WantedBy=network-online.target

diff --git a/debian/ospfd.service b/debian/ospfd.service
index e3ff0473833e9fd2913ac0f903914d1dd7309e24..371565ba9cd1d5ad17f6170a1906ca27a31d2367 100644 (file)
--- a/debian/ospfd.service
+++ b/debian/ospfd.service
@@ -17,6 +17,8 @@ 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=-/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
 [Install]
 WantedBy=network-online.target

diff --git a/debian/ospfd@.service b/debian/ospfd@.service
index 64370cce2a7e62e4cd8f399fc8b33c684602dca9..e93614d4b3b7be6e1375e3e15142b49399de1638 100644 (file)
--- a/debian/ospfd@.service
+++ b/debian/ospfd@.service
@@ -17,6 +17,8 @@ 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/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
 [Install]
 WantedBy=network-online.target

diff --git a/debian/ripd.service b/debian/ripd.service
index f001b797f31e8673d9b946130e9656bc89af1650..7c90d27c0291993f5bad1a2d980cf959940b879f 100644 (file)
--- a/debian/ripd.service
+++ b/debian/ripd.service
@@ -17,6 +17,8 @@ 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=-/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
 [Install]
 WantedBy=network-online.target

diff --git a/debian/ripngd.service b/debian/ripngd.service
index 8c406e972bf59593058bb080ef3f7aca5da1fcd2..6c9e1c649d9fed7364a6cc5a841277a2a40228a2 100644 (file)
--- a/debian/ripngd.service
+++ b/debian/ripngd.service
@@ -17,6 +17,8 @@ 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/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
 [Install]
 WantedBy=network-online.target

diff --git a/debian/zebra.service b/debian/zebra.service
index 042d5a53961df894d4eff162614204aa77af0a50..89314f2d7f7e179b4fd48ec4cf6eaac118dd485c 100644 (file)
--- a/debian/zebra.service
+++ b/debian/zebra.service
@@ -16,6 +16,8 @@ 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=-/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
 [Install]
 WantedBy=network-online.target

diff --git a/tools/quagga b/tools/quagga
index f96fede6efa7f84116ec55f69c314ad5a77c4153..21858aab6af3cac4ad14dd45efbed3725ae6df77 100755 (executable)
--- a/tools/quagga
+++ b/tools/quagga
@@ -22,7 +22,6 @@ startup()
 start_ospfd_multiinstance()
 {
    for instance in $MI; do
-       echo "Starting $instance"
        startup ospfd@$instance
    done
 }
@@ -42,7 +41,6 @@ start_daemons()
 stop_ospfd_multiinstance()
 {
     for instance in $MI; do
-       echo "Stopping instance: $instance"
         /bin/systemctl stop ospfd@$instance
     done
 }