diff options
author | Tasos Katsoulas <12612986+tkatsoulas@users.noreply.github.com> | 2023-03-10 14:25:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-10 14:25:42 +0200 |
commit | 1c53c7b3118f29de8e9a901725e93670aa14d93c (patch) | |
tree | 14cbc3d7d088a2a0958e9c6a0dcc0febcd351b43 /contrib | |
parent | cf85c3b0e9fcda807a2a5e9c1834792d73725a50 (diff) |
Revert "Handle conffiles for DEB packages explicitly instead of automatically." (#14700)
Revert "Handle conffiles for DEB packages explicitly instead of automatically. (#14662)"
This reverts commit 95ccc9cd47510988c77c97b93308548efbc7d939.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/debian/netdata.conffiles | 4 | ||||
-rwxr-xr-x | contrib/debian/rules | 19 |
2 files changed, 0 insertions, 23 deletions
diff --git a/contrib/debian/netdata.conffiles b/contrib/debian/netdata.conffiles deleted file mode 100644 index 5ea613f3d4..0000000000 --- a/contrib/debian/netdata.conffiles +++ /dev/null @@ -1,4 +0,0 @@ -/etc/default/netdata -/etc/init.d/netdata -/etc/logrotate.d/netdata -/etc/netdata/netdata.conf diff --git a/contrib/debian/rules b/contrib/debian/rules index fc3acc3bc0..04cb16ec64 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -127,25 +127,6 @@ override_dh_installlogrotate: cp system/logrotate/netdata debian/netdata.logrotate dh_installlogrotate -override_dh_installdeb: - dh_installdeb - @echo "Recreating conffiles without auto-adding /etc files" - @for dir in ${CURDIR}/debian/*/DEBIAN; do \ - PKG=$$(basename $$(dirname $$dir)); \ - FILES=""; \ - if [ -f ${CURDIR}/debian/conffiles ]; then \ - FILES="${CURDIR}/debian/conffiles"; \ - fi; \ - if [ -f ${CURDIR}/debian/$${PKG}.conffiles ]; then \ - FILES="$$FILES ${CURDIR}/debian/$${PKG}.conffiles"; \ - fi; \ - if [ -n "$$FILES" ]; then \ - cat $$FILES | sort -u > $$dir/conffiles; \ - elif [ -f $$dir/conffiles ]; then \ - rm $$dir/conffiles; \ - fi; \ - done - override_dh_clean: dh_clean |