From: David Lamparter <equinox@diac24.net>
Date: Mon, 10 Dec 2018 23:03:17 +0000 (+0100)
Subject: debian: fix up for new initscripts
X-Git-Tag: frr-7.0~5^2~31
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f301c0938b12eee3c583308246a31904e0e48a73;p=matthieu%2Ffrr.git

debian: fix up for new initscripts

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

diff --git a/debian/frr.install b/debian/frr.install
index 3dff5baae5..744af9d6f4 100644
--- a/debian/frr.install
+++ b/debian/frr.install
@@ -3,7 +3,7 @@ usr/bin/vtysh
 usr/bin/mtracebis
 usr/lib/*/frr/libfrr.*
 usr/lib/*/frr/libfrrospfapiclient.*
-usr/lib/frr/frr
+usr/lib/frr/*.sh
 usr/lib/frr/*d
 usr/lib/frr/watchfrr
 usr/lib/frr/zebra
diff --git a/debian/rules b/debian/rules
index 0b70d35b80..c8d9634ca5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,8 @@ override_dh_auto_install:
 ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)
 	cp tools/frr.service debian/frr.service
 endif
-	cp tools/frr debian/frr.init
+	cp tools/frrinit.sh debian/frr.init
+	-rm -f debian/tmp/usr/lib/frr/frr
 
 # install config files
 	mkdir -p debian/tmp/etc/frr/