proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 22:22:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3507 from opensourcerouting/master-init-fixes

Browse Source 
[master] minor tools/ fixes
This commit is contained in:
Donald Sharp 2018-12-18 19:21:39 -05:00 committed by GitHub
commit 38a5232499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/etc/frr/vtysh.conf
View File

@ -1,2 +1 @@
service integrated-vtysh-config service integrated-vtysh-config
username cumulus nopassword

2
tools/frr.service
View File

@ -1,5 +1,6 @@
[Unit] [Unit]
Description=FRRouting Description=FRRouting
Documentation=https://frrouting.readthedocs.io/en/latest/setup.html
After=networking.service After=networking.service
OnFailure=heartbeat-failed@%n.service OnFailure=heartbeat-failed@%n.service
@ -17,5 +18,6 @@ LimitNOFILE=1024
ExecStart=/usr/lib/frr/frrinit.sh start ExecStart=/usr/lib/frr/frrinit.sh start
ExecStop=/usr/lib/frr/frrinit.sh stop ExecStop=/usr/lib/frr/frrinit.sh stop
ExecReload=/usr/lib/frr/frrinit.sh reload ExecReload=/usr/lib/frr/frrinit.sh reload
[Install] [Install]
WantedBy=network-online.target WantedBy=network-online.target

6
tools/frrcommon.sh.in
View File

@ -83,7 +83,7 @@ daemon_list() {
for daemon in $DAEMONS; do for daemon in $DAEMONS; do
eval cfg=\$$daemon eval cfg=\$$daemon
eval inst=\$${daemon}_instances eval inst=\$${daemon}_instances
[ "$daemon" = zebra ] && cfg=yes [ "$daemon" = zebra -o "$daemon" = staticd ] && cfg=yes
if [ -n "$cfg" -a "$cfg" != "no" -a "$cfg" != "0" ]; then if [ -n "$cfg" -a "$cfg" != "no" -a "$cfg" != "0" ]; then
debug "$daemon enabled" debug "$daemon enabled"
enabled="$enabled $daemon" enabled="$enabled $daemon"
@ -135,6 +135,10 @@ daemon_start() {
ulimit -n $MAX_FDS > /dev/null 2> /dev/null ulimit -n $MAX_FDS > /dev/null 2> /dev/null
daemon_prep "$daemon" "$inst" || return 1 daemon_prep "$daemon" "$inst" || return 1
if test ! -d "$V_PATH"; then
mkdir -p "$V_PATH"
chown frr "$V_PATH"
fi
eval wrap="\$${daemon}_wrap" eval wrap="\$${daemon}_wrap"
bin="$D_PATH/$daemon" bin="$D_PATH/$daemon"