Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

tools: add PIDFile option in frr.service

Browse source 
when type is forking, it is recommended to also use the PIDFile= option,
so that systemd can reliably identify the main process of the service.

Signed-off-by: Emanuele Bovisio <emanuele.bovisio@eolo.it>
This commit is contained in:
Emanuele Bovisio 2020-10-22 17:04:24 +02:00
parent 84de5a245a
commit 566397ba65
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -2466,6 +2466,8 @@ AC_CONFIG_FILES([tools/frr], [chmod +x tools/frr])
AC_CONFIG_FILES([tools/watchfrr.sh], [chmod +x tools/watchfrr.sh])
AC_CONFIG_FILES([tools/frrinit.sh], [chmod +x tools/frrinit.sh])
AC_CONFIG_FILES([tools/frrcommon.sh])
AC_CONFIG_FILES([tools/frr.service])
AC_CONFIG_FILES([tools/frr@.service])
AC_CONFIG_COMMANDS([lib/route_types.h], [
dst="${ac_abs_top_builddir}/lib/route_types.h"

2
tools/.gitignore vendored
View file

@ -6,3 +6,5 @@
/watchfrr.sh
/frrinit.sh
/frrcommon.sh
/frr.service
/frr@.service

7
tools/frr.service → tools/frr.service.in
View file

@ -17,9 +17,10 @@ WatchdogSec=60s
RestartSec=5
Restart=on-abnormal
LimitNOFILE=1024
ExecStart=/usr/lib/frr/frrinit.sh start
ExecStop=/usr/lib/frr/frrinit.sh stop
ExecReload=/usr/lib/frr/frrinit.sh reload
PIDFile=@CFG_STATE@/watchfrr.pid
ExecStart=@CFG_SBIN@/frrinit.sh start
ExecStop=@CFG_SBIN@/frrinit.sh stop
ExecReload=@CFG_SBIN@/frrinit.sh reload
[Install]
WantedBy=multi-user.target

7
tools/frr@.service → tools/frr@.service.in
View file

@ -17,9 +17,10 @@ WatchdogSec=60s
RestartSec=5
Restart=on-abnormal
LimitNOFILE=1024
ExecStart=/usr/lib/frr/frrinit.sh start %I
ExecStop=/usr/lib/frr/frrinit.sh stop %I
ExecReload=/usr/lib/frr/frrinit.sh reload %I
PIDFile=@CFG_STATE@/%I/watchfrr.pid
ExecStart=@CFG_SBIN@/frrinit.sh start %I
ExecStop=@CFG_SBIN@/frrinit.sh stop %I
ExecReload=@CFG_SBIN@/frrinit.sh reload %I
[Install]
WantedBy=multi-user.target