Skip to content

Commit

Permalink
Use only explicitly declared conffiles
Browse files Browse the repository at this point in the history
At compat level>=3, debhelper will automatically add any file in /etc/ in a package as a conffile. Since the securedrop-app-code package ships AppArmor profiles in /etc/ that we want to squash at every install, they must not be specified as conffiles. We can override dh_installdeb to substitute the automatically generated conffile with the one we create.
  • Loading branch information
emkll committed Feb 22, 2019
1 parent 1a04ad8 commit dd6b14d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions install_files/securedrop-app-code/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ endif

override_dh_gencontrol:
dh_gencontrol -- $(SUBSTVARS)

# Move the conffile in version control to squash the autogenerated one by debhelper, as files in /etc/ are automatically marked as conffiles.
# We are shipping AppArmor profiles via this package, and want them to be correctly updated with each update.
override_dh_installdeb:
dh_installdeb
cp ${CURDIR}/debian/conffiles ${CURDIR}/debian/securedrop-app-code/DEBIAN/

0 comments on commit dd6b14d

Please sign in to comment.