From 9210eecc7d99f20b2b3abf9ccd0b638c9fa7aca1 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sun, 28 Oct 2018 16:34:48 +0100 Subject: [PATCH 1/4] tools: add documentation URL on frr.service Signed-off-by: David Lamparter --- tools/frr.service | 2 ++ 1 file changed, 2 insertions(+) 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 From 829d32552b6ce0b08bd7441f894ba7de8055fe25 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 14 Dec 2018 21:16:38 +0100 Subject: [PATCH 2/4] tools/etc: remove cumulus user from vtysh.conf This is a Cumulus-specific default which we shouldn't have in git. Signed-off-by: David Lamparter --- tools/etc/frr/vtysh.conf | 1 - 1 file changed, 1 deletion(-) 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 From b7d492f295ce91d5b5cd008fb1c218c0d67dff6d Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Mon, 17 Dec 2018 19:08:02 +0100 Subject: [PATCH 3/4] tools/frrcommon.sh: actually create /run/frr tmpfiles.d is nice and all, but we can't rely on it. Just create /run/frr if needed. Signed-off-by: David Lamparter --- tools/frrcommon.sh.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 7278e3f9df..193eeed299 100644 --- a/tools/frrcommon.sh.in +++ b/tools/frrcommon.sh.in @@ -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" From 151502651643b67cc9de4e7007a60f2cabce4cab Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Mon, 17 Dec 2018 20:42:51 +0100 Subject: [PATCH 4/4] tools/frrcommon.sh: always start staticd "derp." Since zebra is always started, the same should hold for staticd. Signed-off-by: David Lamparter --- tools/frrcommon.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 193eeed299..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"