summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2018-12-11 00:03:17 +0100
committerDavid Lamparter <equinox@diac24.net>2018-12-18 01:55:51 +0100
commite8010e5190b33cd228be2ed93bcad708660390d5 (patch)
tree9aff8a34eedffeecf42c2f84ba1a554d8d01442e
parent19017544903f24dc77884f8a4c641de41efe9041 (diff)
debian: fix up for new initscripts
Signed-off-by: David Lamparter <equinox@diac24.net>
-rw-r--r--debian/frr.install2
-rwxr-xr-xdebian/rules3
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/frr.install b/debian/frr.install
index a346401be4..742ed95430 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/