aboutsummaryrefslogtreecommitdiff
path: root/manifests/cron/dist-upgrade.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-19 17:03:11 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-19 17:03:11 -0200
commitda0f9de3f9432a9b5941fb93dab69592d92ec1e2 (patch)
tree623820758b9ed1c5bd19164c7aa04b8c0f610bf8 /manifests/cron/dist-upgrade.pp
parent1203852923594064e61fcfa0e4bf35f72000175d (diff)
parent14cd91de33c823c093bb6a9af3ac9f7d27a0500b (diff)
downloadpuppet-apt-da0f9de3f9432a9b5941fb93dab69592d92ec1e2.tar.gz
puppet-apt-da0f9de3f9432a9b5941fb93dab69592d92ec1e2.tar.bz2
Merge branch 'master' of git://labs.riseup.net/shared-apt
Diffstat (limited to 'manifests/cron/dist-upgrade.pp')
-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":