From 010f9c700c20510749d6b435fe4962ac822c6456 Mon Sep 17 00:00:00 2001 From: DmitriyEshenko Date: Thu, 28 May 2020 09:58:37 +0000 Subject: link-detect: T2517: Check if link_filter file exist --- scripts/vyatta-link-detect | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/vyatta-link-detect b/scripts/vyatta-link-detect index ff3886e2..72874571 100755 --- a/scripts/vyatta-link-detect +++ b/scripts/vyatta-link-detect @@ -18,7 +18,9 @@ fi # 1 - ignore receive if admin_down # 2 - ignore receive if admin_down or link down set-sysctl () { - sudo sh -c "echo $2 >/proc/sys/net/ipv4/conf/$1/link_filter" + if [ -f /proc/sys/net/ipv4/conf/$1/link_filter ]; then + sudo sh -c "echo $2 >/proc/sys/net/ipv4/conf/$1/link_filter" + fi # sudo sh -c "echo $2 >/proc/sys/net/ipv6/conf/$1/link_filter" } -- cgit v1.2.3 From b24432ac81ab582b252e4ea3fc0d7d0ba6f4580f Mon Sep 17 00:00:00 2001 From: DmitriyEshenko Date: Thu, 28 May 2020 10:55:32 +0000 Subject: link-detect: T2517: Fix path to zebra daemon --- scripts/vyatta-link-detect | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/vyatta-link-detect b/scripts/vyatta-link-detect index 72874571..aecc0cb2 100755 --- a/scripts/vyatta-link-detect +++ b/scripts/vyatta-link-detect @@ -26,12 +26,12 @@ set-sysctl () { case $2 in on) set-sysctl $1 2 - if [ -f /usr/sbin/zebra ]; then + if [ -f /usr/lib/frr/zebra ]; then exec vtysh -c "configure terminal" -c "interface $1" \ - -c "link-detect" + -c "link-detect" fi ;; off) set-sysctl $1 1 - if [ -f /usr/sbin/zebra ]; then + if [ -f /usr/lib/frr/zebra ]; then exec vtysh -c "configure terminal" -c "interface $1" \ -c "no link-detect" fi ;; -- cgit v1.2.3