proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-26 22:09:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian: Fixup removal of .pid and .vty files

Browse Source 
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>
This commit is contained in:
Donald Sharp 2016-02-23 15:06:59 -05:00
parent 02ba10e595
commit 9b155c8b8f
9 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/bgpd.service vendored
View File

@ -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

4
debian/isisd.service vendored
View File

@ -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

4
debian/ospf6d.service vendored
View File

@ -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

4
debian/ospfd.service vendored
View File

@ -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

4
debian/ospfd@.service vendored
View File

@ -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

4
debian/ripd.service vendored
View File

@ -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

4
debian/ripngd.service vendored
View File

@ -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

4
debian/zebra.service vendored
View File

@ -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

2
tools/quagga
View File

@ -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
}