From: Liam McBirnie <mcbirnie.l@gmail.com>
Date: Fri, 1 Feb 2019 09:55:27 +0000 (+1000)
Subject: Revert "redhat: don't Requires initscript on systemd based distros"
X-Git-Tag: 7.1_pulled~256^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b4e993b2bab82de66f27277afa2a5e44e7fc170f;p=matthieu%2Ffrr.git

Revert "redhat: don't Requires initscript on systemd based distros"

This reverts commit ec59a1559cce612d04131639653eddf65d69e868.

Frr.init (called by frr.service) requires functions provided by
/etc/init.d/functions (part of the initscripts package).

Signed-off-by: Liam McBirnie <liam.mcbirnie@boeing.com>
---

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 7a6344aa4c..6d18c005b9 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -171,6 +171,7 @@ BuildRequires:  python27-sphinx
 BuildRequires:  python-devel >= 2.7
 BuildRequires:  python-sphinx
 %endif
+Requires:       initscripts
 %if %{with_pam}
 BuildRequires:  pam-devel
 %endif
@@ -188,7 +189,6 @@ Requires(post):     chkconfig
 Requires(preun):    chkconfig
 # Initscripts > 5.60 is required for IPv6 support
 Requires(pre):      initscripts >= 5.60
-Requires:           initscripts
 %endif
 Provides:           routingdaemon = %{version}-%{release}
 Obsoletes:          gated mrt zebra frr-sysvinit