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 <equinox@diac24.net>

diff --git a/debian/frr.install b/debian/frr.install
index 744af9d6f41fac32cbe525bbadc6c63343508a68..ebb87a0b3ee751548f77af1fd3a89c4036a367aa 100644 (file)
--- 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 b831fafe460ddb73e23a7f9dd043ec0fe70ae092..a546f38d70c2c627e7a8049751d79a813adbf4fc 100755 (executable)
--- 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