tools: fix systemd OnFailure directive

systemd's %n already includes the type suffix (.service)

Signed-off-by: Simon Deziel <simon@sdeziel.info>

diff --git a/doc/developer/tracing.rst b/doc/developer/tracing.rst
index ae4d621a8e5d96e73655136b444c822d0b3cbc82..63b04585f18c2d197a51c325ea9eb0c73a7247a5 100644 (file)
--- a/doc/developer/tracing.rst
+++ b/doc/developer/tracing.rst
@@ -396,7 +396,7 @@ modifying ``frr.service`` like so:
    --- a/frr.service
    +++ b/frr.service
    @@ -7,6 +7,7 @@ Before=network.target
-    OnFailure=heartbeat-failed@%n.service
+    OnFailure=heartbeat-failed@%n
 
     [Service]
    +Environment="LD_PRELOAD=liblttng-ust-fork.so"

diff --git a/tools/frr.service.in b/tools/frr.service.in
index 836ce06be77937c8e0b395816d4e16b4e2bcfd81..f67bc41b09a61e4b32ab4f3c26d1989a4ca4a922 100644 (file)
--- a/tools/frr.service.in
+++ b/tools/frr.service.in
@@ -4,7 +4,7 @@ Documentation=https://frrouting.readthedocs.io/en/latest/setup.html
 Wants=network.target
 After=network-pre.target systemd-sysctl.service
 Before=network.target
-OnFailure=heartbeat-failed@%n.service
+OnFailure=heartbeat-failed@%n
 
 [Service]
 Nice=-5

diff --git a/tools/frr@.service.in b/tools/frr@.service.in
index 1e5d2523258336ac5734ddcf07307d630a104525..7b94a11f5bcef3ee9cdba5e5462fbd1d3172629a 100644 (file)
--- a/tools/frr@.service.in
+++ b/tools/frr@.service.in
@@ -4,7 +4,7 @@ Documentation=https://frrouting.readthedocs.io/en/latest/setup.html
 Wants=network.target
 After=network-pre.target systemd-sysctl.service
 Before=network.target
-OnFailure=heartbeat-failed@%n.service
+OnFailure=heartbeat-failed@%n
 
 [Service]
 Nice=-5