From: David Lamparter <equinox@diac24.net>
Date: Thu, 25 Oct 2018 13:37:28 +0000 (+0200)
Subject: debianpkg: always install /etc/init.d/frr
X-Git-Tag: 7.1_pulled~219^2~60
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8f196a8b3cb099620030715f19089ccb83f50817;p=matthieu%2Ffrr.git

debianpkg: always install /etc/init.d/frr

There is no point in making this conditional, systemd correctly prefers
the service file over the init script when it is present.  Also, people
can install an init system that doesn't match their distribution and
even change init systems on an installation.

Signed-off-by: David Lamparter <equinox@diac24.net>
---

diff --git a/debianpkg/rules b/debianpkg/rules
index d8c9b24e99..263dbfd209 100755
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -160,9 +160,8 @@ override_dh_auto_install:
 	# let dh_systemd_* and dh_installinit do their thing automatically
 ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)
 	cp tools/frr.service debian/frr.service
-else
-	cp tools/frr debian/frr.init
 endif
+	cp tools/frr debian/frr.init
 
 	# install config files
 	mkdir -p debian/tmp/etc/frr/