diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-19 17:03:11 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-19 17:03:11 -0200 |
| commit | da0f9de3f9432a9b5941fb93dab69592d92ec1e2 (patch) | |
| tree | 623820758b9ed1c5bd19164c7aa04b8c0f610bf8 | |
| parent | 1203852923594064e61fcfa0e4bf35f72000175d (diff) | |
| parent | 14cd91de33c823c093bb6a9af3ac9f7d27a0500b (diff) | |
| download | puppet-apt-da0f9de3f9432a9b5941fb93dab69592d92ec1e2.tar.gz puppet-apt-da0f9de3f9432a9b5941fb93dab69592d92ec1e2.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/shared-apt
| -rw-r--r-- | manifests/cron/dist-upgrade.pp | 2 | ||||
| -rw-r--r-- | templates/Debian/preferences_squeeze.erb | 5 |
2 files changed, 6 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": diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb index 3de7959..5e15d27 100644 --- a/templates/Debian/preferences_squeeze.erb +++ b/templates/Debian/preferences_squeeze.erb @@ -3,6 +3,11 @@ Package: * Pin: release o=Debian,n=<%= codename %> Pin-Priority: 990 +Explanation: Debian <%= codename %>-updates +Package: * +Pin: release o=Debian,n=<%= codename %>-updates +Pin-Priority: 990 + Explanation: Debian backports Package: * Pin: origin backports.debian.org |