From 58b1c7b653bba75935106bf09a042cea35f4ee45 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 18 Dec 2018 02:21:18 +0100 Subject: debian: fix dropping daemons.conf Need to apply some manual control here, so remove it from frr.install and just do it in rules. Signed-off-by: David Lamparter --- debian/rules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index b831fafe4..a546f38d7 100755 --- a/debian/rules +++ b/debian/rules @@ -80,10 +80,12 @@ endif -rm -f debian/tmp/usr/lib/frr/frr # install config files - mkdir -p debian/tmp/etc/frr/ - sed -e 's#^!log file #!log file /var/log/frr/#' -i debian/tmp/usr/share/doc/frr/examples/*sample* + mkdir -p debian/tmp/etc + cp -r tools/etc/* debian/tmp/etc/ -rm debian/tmp/etc/frr/daemons.conf + sed -e 's#^!log file #!log file /var/log/frr/#' -i debian/tmp/usr/share/doc/frr/examples/*sample* + # drop dev-only files find debian/tmp -name '*.la' -o -name '*.a' -o -name 'lib*.so' | xargs rm -f rm -rf debian/tmp/usr/include -- cgit v1.2.3