mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-05 15:10:38 +00:00
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
This commit is contained in:
commit
ceebe0c4e0
1
debian/bgpd.service
vendored
1
debian/bgpd.service
vendored
@ -17,5 +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
|
||||
[Install]
|
||||
WantedBy=network-online.target
|
||||
|
1
debian/isisd.service
vendored
1
debian/isisd.service
vendored
@ -17,5 +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
|
||||
[Install]
|
||||
WantedBy=network-online.target
|
||||
|
1
debian/ospf6d.service
vendored
1
debian/ospf6d.service
vendored
@ -16,5 +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
|
||||
[Install]
|
||||
WantedBy=network-online.target
|
||||
|
1
debian/ospfd.service
vendored
1
debian/ospfd.service
vendored
@ -17,5 +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
|
||||
[Install]
|
||||
WantedBy=network-online.target
|
||||
|
1
debian/ospfd@.service
vendored
1
debian/ospfd@.service
vendored
@ -17,5 +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
|
||||
[Install]
|
||||
WantedBy=network-online.target
|
||||
|
1
debian/quagga.install
vendored
1
debian/quagga.install
vendored
@ -3,6 +3,7 @@ usr/bin/vtysh
|
||||
usr/include/quagga/
|
||||
usr/lib/
|
||||
tools/quagga-reload.py usr/lib/quagga/
|
||||
tools/startup usr/lib/quagga/
|
||||
usr/share/doc/quagga/
|
||||
usr/share/man/man1/vtysh.1
|
||||
usr/share/man/man8
|
||||
|
14
debian/quagga.service
vendored
14
debian/quagga.service
vendored
@ -8,13 +8,13 @@ Type=simple
|
||||
RemainAfterExit=yes
|
||||
TimeoutSec=2m30s
|
||||
TimeoutStopSec=1m
|
||||
ExecStartPre=-/bin/systemctl start zebra.service
|
||||
ExecStartPre=-/bin/systemctl start bgpd.service
|
||||
ExecStartPre=-/bin/systemctl start isisd.service
|
||||
ExecStartPre=-/bin/systemctl start ospfd.service
|
||||
ExecStartPre=-/bin/systemctl start ospf6d.service
|
||||
ExecStartPre=-/bin/systemctl start ripd.service
|
||||
ExecStartPre=-/bin/systemctl start ripngd.service
|
||||
ExecStartPre=-/usr/lib/quagga/startup zebra
|
||||
ExecStartPre=-/usr/lib/quagga/startup bgpd
|
||||
ExecStartPre=-/usr/lib/quagga/startup isisd
|
||||
ExecStartPre=-/usr/lib/quagga/startup ospfd
|
||||
ExecStartPre=-/usr/lib/quagga/startup ospf6d
|
||||
ExecStartPre=-/usr/lib/quagga/startup ripd
|
||||
ExecStartPre=-/usr/lib/quagga/startup ripngd
|
||||
ExecStartPost=-/usr/bin/vtysh -b -n
|
||||
#
|
||||
ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf
|
||||
|
1
debian/ripd.service
vendored
1
debian/ripd.service
vendored
@ -17,5 +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
|
||||
[Install]
|
||||
WantedBy=network-online.target
|
||||
|
1
debian/ripngd.service
vendored
1
debian/ripngd.service
vendored
@ -17,5 +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
|
||||
[Install]
|
||||
WantedBy=network-online.target
|
||||
|
1
debian/zebra.service
vendored
1
debian/zebra.service
vendored
@ -16,5 +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
|
||||
[Install]
|
||||
WantedBy=network-online.target
|
||||
|
20
tools/startup
Executable file
20
tools/startup
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
# Script to see if we should startup the particular
|
||||
# daemon as part of systemd initialization
|
||||
# If the daemon was running (set by the ExecStopPost
|
||||
# action in the Unit file ) or if the daemon
|
||||
# is enabled start it up
|
||||
FILE="/var/run/quagga/$1.was_running"
|
||||
if [ -e $FILE ]
|
||||
then
|
||||
rm $FILE
|
||||
systemctl start $1
|
||||
fi
|
||||
|
||||
systemctl is-enabled $1 > /dev/null
|
||||
if [ $? -eq 0 ]
|
||||
then
|
||||
systemctl start $1
|
||||
fi
|
||||
|
||||
exit 0
|
Loading…
Reference in New Issue
Block a user