Arturo Borrero Gonzalez has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392421 )
Change subject: apt: add --force-confold/--force-confdef dpkg option to apt
calls
......................................................................
apt: add --force-confold/--force-confdef dpkg option to apt calls
This new configuration tells apt to call dpkg with '--force-confold' which will
skip unnecesary prompts when upgrading packages and choose to keep old config
files by default.
The '--foce-confdef' option is also added for dpkg to don't prompt
in cases where other prompts may arise (for example, a new conffile replacing
an old conffile that we din't edit).
In the systems using unattended-upgrades, we will see 2 new files:
* /etc/apt/apt.conf.d/00dpkg-force-confdef, with content:
Dpkg::Options:: "--force-confdef";
* /etc/apt/apt.conf.d/00dpkg-force-confold, with content:
Dpkg::Options:: "--force-confold";
Bug: T180811
Change-Id: Iab1a7219e8d129b1a39e172164e7a72430ea9552
Signed-off-by: Arturo Borrero Gonzalez <aborr...@wikimedia.org>
---
M modules/apt/manifests/unattendedupgrades.pp
1 file changed, 18 insertions(+), 0 deletions(-)
Approvals:
Arturo Borrero Gonzalez: Looks good to me, approved
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/apt/manifests/unattendedupgrades.pp
b/modules/apt/manifests/unattendedupgrades.pp
index 993eb3b..c02745c 100644
--- a/modules/apt/manifests/unattendedupgrades.pp
+++ b/modules/apt/manifests/unattendedupgrades.pp
@@ -4,6 +4,24 @@
ensure => $ensure,
}
+ # dpkg tries to determine the most conservative default action in case of
+ # conffile conflict. This tells dpkg to use that action without asking
+ apt::conf { 'dpkg-force-confdef':
+ ensure => present,
+ priority => '00',
+ key => 'Dpkg::Options::',
+ value => '--force-confdef',
+ }
+
+ # In case of conffile conflicts, tell dpkg to keep the old conffile without
+ # asking
+ apt::conf { 'dpkg-force-confold':
+ ensure => present,
+ priority => '00',
+ key => 'Dpkg::Options::',
+ value => '--force-confold',
+ }
+
apt::conf { 'auto-upgrades':
ensure => $ensure,
priority => '20',
--
To view, visit https://gerrit.wikimedia.org/r/392421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab1a7219e8d129b1a39e172164e7a72430ea9552
Gerrit-PatchSet: 13
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Arturo Borrero Gonzalez <aborr...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Arturo Borrero Gonzalez <aborr...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
