From 9b155c8b8fd49aa2a1a01de959e13e7a7b095f78 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 23 Feb 2016 15:06:59 -0500 Subject: [PATCH] debian: Fixup removal of .pid and .vty files The .pid and .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 Reviewed-by: Daniel Walton --- debian/bgpd.service | 4 +++- debian/isisd.service | 4 +++- debian/ospf6d.service | 4 +++- debian/ospfd.service | 4 +++- debian/ospfd@.service | 4 +++- debian/ripd.service | 4 +++- debian/ripngd.service | 4 +++- debian/zebra.service | 4 +++- tools/quagga | 2 -- 9 files changed, 24 insertions(+), 10 deletions(-) diff --git a/debian/bgpd.service b/debian/bgpd.service index ace3ba5582..2ef0081427 100644 --- 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 c86804118d..001a72d295 100644 --- 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 95c237da9b..c3966d4fa1 100644 --- 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 e3ff047383..371565ba9c 100644 --- 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 64370cce2a..e93614d4b3 100644 --- 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 f001b797f3..7c90d27c02 100644 --- 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 8c406e972b..6c9e1c649d 100644 --- 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 042d5a5396..89314f2d7f 100644 --- 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 f96fede6ef..21858aab6a 100755 --- 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 } -- 2.39.5