summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/frr.install3
-rwxr-xr-xdebian/rules6
2 files changed, 5 insertions, 4 deletions
diff --git a/debian/frr.install b/debian/frr.install
index 744af9d6f..ebb87a0b3 100644
--- a/debian/frr.install
+++ b/debian/frr.install
@@ -1,4 +1,4 @@
-etc/frr/
+etc/
usr/bin/vtysh
usr/bin/mtracebis
usr/lib/*/frr/libfrr.*
@@ -12,6 +12,5 @@ usr/lib/*/frr/modules/zebra_fpm.so
usr/share/doc/frr/examples
usr/share/man/
usr/share/yang/
-tools/etc/* etc/
tools/frr-reload usr/lib/frr/
debian/frr.conf usr/lib/tmpfiles.d
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