aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@puppet.nadir.org>2011-04-02 07:53:38 +0000
committerroot <root@puppet.nadir.org>2011-04-02 07:53:38 +0000
commit63c7b5a643c73932d436072370bda2e184b2b615 (patch)
treebff185a92c582f3769864f021f6c9d15b6a78455
parent13033f7d814fe6c006d47108b5df5e0505975010 (diff)
parent14cd91de33c823c093bb6a9af3ac9f7d27a0500b (diff)
downloadpuppet-apt-63c7b5a643c73932d436072370bda2e184b2b615.tar.gz
puppet-apt-63c7b5a643c73932d436072370bda2e184b2b615.tar.bz2
Merge branch 'master' of git://labs.riseup.net/shared-apt
-rw-r--r--manifests/cron/dist-upgrade.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/cron/dist-upgrade.pp b/manifests/cron/dist-upgrade.pp
index 3d7cf16..2568cb7 100644
--- a/manifests/cron/dist-upgrade.pp
+++ b/manifests/cron/dist-upgrade.pp
@@ -1,7 +1,7 @@
class apt::cron::dist-upgrade inherits apt::cron::base {
$action = "autoclean -y
-dist-upgrade -y -o APT::Get::Show-Upgraded=true
+dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold'
"
file { "/etc/cron-apt/action.d/3-download":