diff options
| author | David Lamparter <equinox@diac24.net> | 2018-12-18 02:21:18 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-02-19 21:34:07 +0100 |
| commit | 58b1c7b653bba75935106bf09a042cea35f4ee45 (patch) | |
| tree | a1bdae7cab04436ab164eaf03d123e818a7d937a /debian | |
| parent | debian: rework autopkgtests (diff) | |
| download | frr-58b1c7b653bba75935106bf09a042cea35f4ee45.tar.xz frr-58b1c7b653bba75935106bf09a042cea35f4ee45.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | debian/frr.install | 3 | ||||
| -rwxr-xr-x | debian/rules | 6 |
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 |