Commit 15242ed4 authored by Alan's avatar Alan

ASP: save disabled APT conf snippet in /etc/apt/apt.conf.d/

Save disabled APT conf snippet in /etc/apt/apt.conf.d/ but enable it in the end
of the build only. This makes the code more understandable for future
maintainers than creating the file from the build hook.

Refs: #14594.
parent 20bb1dc7
......@@ -3,8 +3,5 @@
set -e
set -u
cat > /etc/apt/apt.conf.d/80tails-additional-software << EOF
DPkg::Pre-Install-Pkgs { "/usr/local/sbin/tails-additional-software apt-pre"; };
DPkg::Post-Invoke { "/usr/local/sbin/tails-additional-software apt-post &"; };
DPkg::Tools::Options::/usr/local/sbin/tails-additional-software::Version "3";
EOF
mv /etc/apt/apt.conf.d/80tails-additional-software.disabled \
/etc/apt/apt.conf.d/80tails-additional-software
# This configuration should not run during Tails build. It is enabled in the
# end of the build by /config/chroot_local-hooks/99-zz-install-ASP-DPKG-hooks
DPkg::Pre-Install-Pkgs { "/usr/local/sbin/tails-additional-software apt-pre"; };
DPkg::Post-Invoke { "/usr/local/sbin/tails-additional-software apt-post &"; };
DPkg::Tools::Options::/usr/local/sbin/tails-additional-software::Version "3";
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment