diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-12-18 19:21:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 19:21:57 -0500 |
| commit | 9b49d7d69efe5683f94b04dda8567f83e0e13c60 (patch) | |
| tree | 4ba554b3b0f8f757310dd353a5c17208c303905a | |
| parent | 1e8dc574c72d6b210f463a37f12da133c8c674db (diff) | |
| parent | 0c94866519f25e2ed9b7559001f8a15da8f3ef4e (diff) | |
Merge pull request #3506 from opensourcerouting/6.0-init-fixes
[6.0] minor tools/ fixes
| -rw-r--r-- | tools/etc/frr/vtysh.conf | 1 | ||||
| -rw-r--r-- | tools/frr.service | 2 | ||||
| -rw-r--r-- | tools/frrcommon.sh.in | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/tools/etc/frr/vtysh.conf b/tools/etc/frr/vtysh.conf index 80ceb00891..e0ab9cb6f3 100644 --- a/tools/etc/frr/vtysh.conf +++ b/tools/etc/frr/vtysh.conf @@ -1,2 +1 @@ service integrated-vtysh-config -username cumulus nopassword diff --git a/tools/frr.service b/tools/frr.service index 03112bd7cd..c7568593b3 100644 --- a/tools/frr.service +++ b/tools/frr.service @@ -1,5 +1,6 @@ [Unit] Description=FRRouting +Documentation=https://frrouting.readthedocs.io/en/latest/setup.html After=networking.service OnFailure=heartbeat-failed@%n.service @@ -17,5 +18,6 @@ LimitNOFILE=1024 ExecStart=/usr/lib/frr/frrinit.sh start ExecStop=/usr/lib/frr/frrinit.sh stop ExecReload=/usr/lib/frr/frrinit.sh reload + [Install] WantedBy=network-online.target diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 7278e3f9df..fa2fdc94b2 100644 --- a/tools/frrcommon.sh.in +++ b/tools/frrcommon.sh.in @@ -83,7 +83,7 @@ daemon_list() { for daemon in $DAEMONS; do eval cfg=\$$daemon 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 debug "$daemon enabled" enabled="$enabled $daemon" @@ -135,6 +135,10 @@ daemon_start() { ulimit -n $MAX_FDS > /dev/null 2> /dev/null 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" bin="$D_PATH/$daemon" |